summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cleanup' of https://github.com/pascalchevrel/moonmoon into ↵Maurice Svay2012-03-1014-947/+934
|\ | | | | | | | | | | | | | | pascalchevrel-cleanup Conflicts: admin/default.css app/classes/Planet.class.php
| * convert all files saved in Windows(CRLF) to Unix (LF)Pascal Chevrel2012-03-0914-912/+912
| |
* | Merge pull request #21 from pascalchevrel/ConvertPHP4codeMaurice Svay2012-03-085-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 Chevrel2012-03-095-75/+113
| | | | | | | | | | | | syntax instead of PHP4
* | | Merge pull request #20 from pascalchevrel/cleanupMaurice Svay2012-03-082-186/+0
|\ \ \ | | |/ | |/| Cleanup
| * | remove lib.String.php and lib.http.php which are included in the archive but ↵Pascal Chevrel2012-03-082-186/+0
| |/ | | | | | | not used anywhere
| * Merge branch 'master' into ConvertPHP4codePascal Chevrel2012-03-0823-14888/+15112
| |\
| * \ Merge branch 'master' into ConvertPHP4codePascal Chevrel2012-03-065-916/+1099
| |\ \
* | \ \ Merge pull request #18 from pascalchevrel/admin_templateMaurice Svay2012-03-082-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 Chevrel2012-03-082-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/installProcessMaurice Svay2012-03-083-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 Chevrel2012-03-083-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_templateMaurice Svay2012-03-075-153/+148
|\ \ \ | | | | | | | | Admin template
| * | | Use a centralized template for the admin section to avoid repeating htmlPascal Chevrel2012-03-065-153/+148
| | |/ | |/|
* | | Remove relative datesMaurice Svay2012-03-073-88/+0
| | |
* | | One file per classMaurice Svay2012-03-079-164/+172
| | |
* | | Add cache folderMaurice Svay2012-03-071-0/+0
| | |
* | | Merge pull request #16 from pascalchevrel/installProcessMaurice Svay2012-03-071-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 Chevrel2012-03-071-16/+27
|/ / / | | | | | | | | | any new file requirement is now an addition to the array
* | | Merge pull request #15 from pascalchevrel/installProcessMaurice Svay2012-03-062-1/+5
|\ \ \ | | | | | | | | Install process
| * | | Currently, the install process will systematically fail because there is no ↵Pascal Chevrel2012-03-061-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 accountPascal Chevrel2012-03-061-1/+1
| | | |
| * | | Merge branch 'master' of github.com:pascalchevrel/moonmoonPascal Chevrel2012-03-061-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore
| | * | | specify that we want to exclude .spc files and not all files in the cache ↵Pascal Chevrel2012-03-061-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 gitignorePascal Chevrel2012-03-061-1/+0
| |/ / /
| * | | Merge remote-tracking branch 'upstream/master'Pascal Chevrel2012-03-062-14503/+14801
| |\ \ \ | |/ / / |/| / / | |/ /
* | | Merge pull request #9 from pascalchevrel/unhtmlspecialcharsMaurice Svay2012-03-061-14/+4
|\ \ \ | | | | | | | | Unhtmlspecialchars
| * | | remove unhtmlspecialchars() which is a reimplementation of a native php ↵Pascal Chevrel2012-02-261-14/+4
| | | | | | | | | | | | | | | | function, htmlspecialchars_decode()
| * | | Merge remote-tracking branch 'upstream/master'Pascal Chevrel2012-02-260-0/+0
| |\ \ \
* | \ \ \ Merge pull request #8 from pascalchevrel/simplepieMaurice Svay2012-02-291-14438/+14736
|\ \ \ \ \ | | | | | | | | | | | | Update SimplePie to 1.2.1
| * | | | | update SimplePie library to 1.2.1Pascal Chevrel2012-02-261-14438/+14736
| |/ / / /
* | | | | Merge pull request #11 from pascalchevrel/spycMaurice Svay2012-02-294-902/+1095
|\ \ \ \ \ | | | | | | | | | | | | Spyc
| * | | | | update spyc library from 0.2.3 to 0.5Pascal Chevrel2012-02-284-902/+1095
| |/ / / /
* | | | | Merge pull request #12 from pascalchevrel/ConvertPHP4codeMaurice Svay2012-02-291-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 Chevrel2012-02-281-65/+65
| |/ / | | | | | | | | | load() method static so as to avoid a warning in administration.php in strict mode
* | | Merge pull request #7 from ↵Maurice Svay2012-02-261-6/+6
|\ \ \ | | | | | | | | | | | | | | | | pascalchevrel/7cf7115c6e8262b21e55bf3b9cc0865bd82a3dc0 Correct Mime Type for Atom feed
| | | * update spyc library from 0.2.3 to 0.5Pascal Chevrel2012-03-064-902/+1095
| | | |
| | | * remove unhtmlspecialchars() which is a reimplementation of a native php ↵Pascal Chevrel2012-03-061-14/+4
| | |/ | | | | | | | | | function, htmlspecialchars_decode()
| | * revert previous update to SimplePiePascal Chevrel2012-02-261-945/+647
| | |
| | * update SimplePie library from 1.2.0 to 1.2.1Pascal Chevrel2012-02-261-647/+945
| |/
| * fix Mime Type for Atom feedPascal Chevrel2012-02-261-6/+6
|/
* Merge branch 'master' of github.com:mauricesvay/moonmoonMaurice Svay2011-07-101-1/+1
|\
| * Merge pull request #2 from genezys/patch-1Maurice Svay2011-05-141-1/+1
| |\ | | | | | | Changed "PHP5" instead of just "5"
| | * Changed "PHP5" instead of just "5"Vincent Robert2011-05-141-1/+1
| |/
* | Refactor app instantiationMaurice Svay2011-07-104-43/+23
| |
* | Remove benchmarking codeMaurice Svay2011-07-101-9/+0
| |
* | Add people.opml to .gitignoreMaurice Svay2011-02-081-0/+1
|/
* Add cache to .gitignoreMaurice Svay2011-02-071-1/+1
|
* Replace hardcoded value by configMaurice Svay2011-02-072-3/+4
|
* Add .gitignoreMaurice Svay2011-02-071-0/+2
|