Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cleanup' of https://github.com/pascalchevrel/moonmoon into ↵ | Maurice Svay | 2012-03-10 | 14 | -947/+934 |
|\ | | | | | | | | | | | | | | | pascalchevrel-cleanup Conflicts: admin/default.css app/classes/Planet.class.php | ||||
| * | convert all files saved in Windows(CRLF) to Unix (LF) | Pascal Chevrel | 2012-03-09 | 14 | -912/+912 |
| | | |||||
* | | Merge pull request #21 from pascalchevrel/ConvertPHP4code | Maurice Svay | 2012-03-08 | 5 | -75/+113 |
|\ \ | | | | | | | Refactoring, this is a syntax change for all Planet* classes to use PHP5 syntax | ||||
| * | | Refactioring, this is a syntax change for all Planet* classes to use PHP5 ↵ | Pascal Chevrel | 2012-03-09 | 5 | -75/+113 |
| | | | | | | | | | | | | syntax instead of PHP4 | ||||
* | | | Merge pull request #20 from pascalchevrel/cleanup | Maurice Svay | 2012-03-08 | 2 | -186/+0 |
|\ \ \ | | |/ | |/| | Cleanup | ||||
| * | | remove lib.String.php and lib.http.php which are included in the archive but ↵ | Pascal Chevrel | 2012-03-08 | 2 | -186/+0 |
| |/ | | | | | | | not used anywhere | ||||
| * | Merge branch 'master' into ConvertPHP4code | Pascal Chevrel | 2012-03-08 | 23 | -14888/+15112 |
| |\ | |||||
| * \ | Merge branch 'master' into ConvertPHP4code | Pascal Chevrel | 2012-03-06 | 5 | -916/+1099 |
| |\ \ | |||||
* | \ \ | Merge pull request #18 from pascalchevrel/admin_template | Maurice Svay | 2012-03-08 | 2 | -59/+64 |
|\ \ \ \ | | | | | | | | | | | change the template in the admin panel to use HTML5 syntax | ||||
| * | | | | change the template in the admin panel to use HTML5 syntax (and use <header> ↵ | Pascal Chevrel | 2012-03-08 | 2 | -59/+64 |
| | | | | | | | | | | | | | | | | | | | | and <nav> elements), adjust css accordingly, add IE6/7/8 support by loading http://html5shiv.googlecode.com/svn/trunk/html5.js with IE conditionnal comments | ||||
* | | | | | Merge pull request #19 from pascalchevrel/installProcess | Maurice Svay | 2012-03-08 | 3 | -29/+25 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | fix install process and admin section which are currently broken because... | ||||
| * | | | fix install process and admin section which are currently broken because of ↵ | Pascal Chevrel | 2012-03-08 | 3 | -29/+25 |
|/ / / | | | | | | | | | | the separation of classes in separate files. Now the files calling those classes are including app/app.php, also, I changed the variable name in the installation wizard to so as to avoid confusion with already used in the admin section | ||||
* | | | Merge pull request #13 from pascalchevrel/admin_template | Maurice Svay | 2012-03-07 | 5 | -153/+148 |
|\ \ \ | | | | | | | | | Admin template | ||||
| * | | | Use a centralized template for the admin section to avoid repeating html | Pascal Chevrel | 2012-03-06 | 5 | -153/+148 |
| | |/ | |/| | |||||
* | | | Remove relative dates | Maurice Svay | 2012-03-07 | 3 | -88/+0 |
| | | | |||||
* | | | One file per class | Maurice Svay | 2012-03-07 | 9 | -164/+172 |
| | | | |||||
* | | | Add cache folder | Maurice Svay | 2012-03-07 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #16 from pascalchevrel/installProcess | Maurice Svay | 2012-03-07 | 1 | -16/+27 |
|\ \ \ | | | | | | | | | refactor testing of requirements to have more readable and expandable co... | ||||
| * | | | refactor testing of requirements to have more readable and expandable code, ↵ | Pascal Chevrel | 2012-03-07 | 1 | -16/+27 |
|/ / / | | | | | | | | | | any new file requirement is now an addition to the array | ||||
* | | | Merge pull request #15 from pascalchevrel/installProcess | Maurice Svay | 2012-03-06 | 2 | -1/+5 |
|\ \ \ | | | | | | | | | Install process | ||||
| * | | | Currently, the install process will systematically fail because there is no ↵ | Pascal Chevrel | 2012-03-06 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | cache folder when you uncompress moonmoon archive. Adding a proper cache folder with its own .gitignore file | ||||
| * | | | update .gitignore to not take cache into account | Pascal Chevrel | 2012-03-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:pascalchevrel/moonmoon | Pascal Chevrel | 2012-03-06 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore | ||||
| | * | | | specify that we want to exclude .spc files and not all files in the cache ↵ | Pascal Chevrel | 2012-03-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | folder, this is to allow having the cache folder itself to be tracked in git | ||||
| * | | | | remove a temp file and its tracking in gitignore | Pascal Chevrel | 2012-03-06 | 1 | -1/+0 |
| |/ / / | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Pascal Chevrel | 2012-03-06 | 2 | -14503/+14801 |
| |\ \ \ | |/ / / |/| / / | |/ / | |||||
* | | | Merge pull request #9 from pascalchevrel/unhtmlspecialchars | Maurice Svay | 2012-03-06 | 1 | -14/+4 |
|\ \ \ | | | | | | | | | Unhtmlspecialchars | ||||
| * | | | remove unhtmlspecialchars() which is a reimplementation of a native php ↵ | Pascal Chevrel | 2012-02-26 | 1 | -14/+4 |
| | | | | | | | | | | | | | | | | function, htmlspecialchars_decode() | ||||
| * | | | Merge remote-tracking branch 'upstream/master' | Pascal Chevrel | 2012-02-26 | 0 | -0/+0 |
| |\ \ \ | |||||
* | \ \ \ | Merge pull request #8 from pascalchevrel/simplepie | Maurice Svay | 2012-02-29 | 1 | -14438/+14736 |
|\ \ \ \ \ | | | | | | | | | | | | | Update SimplePie to 1.2.1 | ||||
| * | | | | | update SimplePie library to 1.2.1 | Pascal Chevrel | 2012-02-26 | 1 | -14438/+14736 |
| |/ / / / | |||||
* | | | | | Merge pull request #11 from pascalchevrel/spyc | Maurice Svay | 2012-02-29 | 4 | -902/+1095 |
|\ \ \ \ \ | | | | | | | | | | | | | Spyc | ||||
| * | | | | | update spyc library from 0.2.3 to 0.5 | Pascal Chevrel | 2012-02-28 | 4 | -902/+1095 |
| |/ / / / | |||||
* | | | | | Merge pull request #12 from pascalchevrel/ConvertPHP4code | Maurice Svay | 2012-02-29 | 1 | -65/+65 |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | convert OpmlManager class to PHP5 syntax and make the load() function static | ||||
| * | | | update the OpmlManager class syntax to be more PHP5 compliant and make the ↵ | Pascal Chevrel | 2012-02-28 | 1 | -65/+65 |
| |/ / | | | | | | | | | | load() method static so as to avoid a warning in administration.php in strict mode | ||||
* | | | Merge pull request #7 from ↵ | Maurice Svay | 2012-02-26 | 1 | -6/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | pascalchevrel/7cf7115c6e8262b21e55bf3b9cc0865bd82a3dc0 Correct Mime Type for Atom feed | ||||
| | | * | update spyc library from 0.2.3 to 0.5 | Pascal Chevrel | 2012-03-06 | 4 | -902/+1095 |
| | | | | |||||
| | | * | remove unhtmlspecialchars() which is a reimplementation of a native php ↵ | Pascal Chevrel | 2012-03-06 | 1 | -14/+4 |
| | |/ | | | | | | | | | | function, htmlspecialchars_decode() | ||||
| | * | revert previous update to SimplePie | Pascal Chevrel | 2012-02-26 | 1 | -945/+647 |
| | | | |||||
| | * | update SimplePie library from 1.2.0 to 1.2.1 | Pascal Chevrel | 2012-02-26 | 1 | -647/+945 |
| |/ | |||||
| * | fix Mime Type for Atom feed | Pascal Chevrel | 2012-02-26 | 1 | -6/+6 |
|/ | |||||
* | Merge branch 'master' of github.com:mauricesvay/moonmoon | Maurice Svay | 2011-07-10 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #2 from genezys/patch-1 | Maurice Svay | 2011-05-14 | 1 | -1/+1 |
| |\ | | | | | | | Changed "PHP5" instead of just "5" | ||||
| | * | Changed "PHP5" instead of just "5" | Vincent Robert | 2011-05-14 | 1 | -1/+1 |
| |/ | |||||
* | | Refactor app instantiation | Maurice Svay | 2011-07-10 | 4 | -43/+23 |
| | | |||||
* | | Remove benchmarking code | Maurice Svay | 2011-07-10 | 1 | -9/+0 |
| | | |||||
* | | Add people.opml to .gitignore | Maurice Svay | 2011-02-08 | 1 | -0/+1 |
|/ | |||||
* | Add cache to .gitignore | Maurice Svay | 2011-02-07 | 1 | -1/+1 |
| | |||||
* | Replace hardcoded value by config | Maurice Svay | 2011-02-07 | 2 | -3/+4 |
| | |||||
* | Add .gitignore | Maurice Svay | 2011-02-07 | 1 | -0/+2 |
| |