summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editorTom Needham2011-10-0761-146/+804
|\
| * disable openid on defaultRobin Appelman2011-10-071-1/+0
| * Merge branch 'master' of gitorious.org:owncloud/owncloudRobin Appelman2011-10-0746-88/+36
| |\
| | * renamed iconsJan-Christoph Borchardt2011-10-0715-0/+0
| | * some icon correctionsJan-Christoph Borchardt2011-10-077-3/+3
| | * added Silk icons by Mark James (CC-BY)Jan-Christoph Borchardt2011-10-0737-7/+30
| | * Change colorselector to use border for selected colorBart Visscher2011-10-074-78/+3
| * | Merge branch 'master' of gitorious.org:owncloud/owncloudRobin Appelman2011-10-0721-165/+846
| |\|
| | * conflicts solvedMarvin Thomas Rabe2011-10-0612-70/+757
| | |\
| | | * Add icon for calendar color selectorBart Visscher2011-10-063-1/+74
| | | * Start using OC_JSON in gallery appBart Visscher2011-10-067-34/+17
| | | * Replace _ in timezone setting with a spaceBart Visscher2011-10-061-1/+1
| | | * Implement timezone fix from Stephen Rees-CarterBart Visscher2011-10-061-9/+11
| | | * Merge branch 'master' of gitorious.org:owncloud/owncloudGeorg Ehrke2011-10-0619-65/+137
| | | |\
| | | * | support of RRULE in calendar appGeorg Ehrke2011-10-061-34/+665
| | * | | Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/ownclou...Marvin Thomas Rabe2011-10-068-60/+41
| | |\ \ \
| | | * | | BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.Stephen Rees-Carter2011-10-061-24/+26
| | | * | | Updating .gitignore to ignore *.geany project files.Stephen Rees-Carter2011-10-061-1/+4
| | | | |/ | | | |/|
| | | * | another query fixBartek Przybylski2011-10-051-1/+1
| | * | | Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/ownclou...Marvin Thomas Rabe2011-10-061-2/+3
| | |\ \ \
| | | * | | Fixed the file sharing listing bug (filename is empty when it has no extensio...Borjan Tchakaloff2011-10-051-2/+3
| | * | | | Merge commit 'refs/merge-requests/53' of git://gitorious.org/owncloud/ownclou...Marvin Thomas Rabe2011-10-061-26/+39
| | |\ \ \ \
| | | * | | | Fixed the 'Undefined index "user_id"' bug when requesting a publicly shared f...Borjan Tchakaloff2011-10-051-26/+39
| | | |/ / /
| | * | | | Merge commit 'refs/merge-requests/54' of git://gitorious.org/owncloud/ownclou...Marvin Thomas Rabe2011-10-065-12/+61
| | |\ \ \ \
| | | * | | | Added the missing quotes on the filename.Borjan Tchakaloff2011-10-051-1/+1
| | | |/ / /
| | * | | | updated marginsMarvin Thomas Rabe2011-10-044-7/+6
| * | | | | Merge branch 'master' of gitorious.org:owncloud/owncloudRobin Appelman2011-10-0571-450/+526
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | use browsercache for gallery coversRobin Appelman2011-10-021-0/+6
* | | | | | Updated saving feedbackTom Needham2011-10-053-4/+25
* | | | | | Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editorTom Needham2011-10-0511-46/+71
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | correct wrong variable name in remoteStorage appMichiel@unhosted2011-10-051-1/+1
| * | | | | gallery db query fixBartek Przybylski2011-10-054-9/+9
| * | | | | disabled gallery app by default until it's in a branchJan-Christoph Borchardt2011-10-051-2/+1
| * | | | | removed extra calendar settings. Also, table layout?Jan-Christoph Borchardt2011-10-051-23/+0
| | |/ / / | |/| | |
| * | | | Add new contact name to end of cantact listBart Visscher2011-10-043-3/+4
| * | | | All the basic field for add contact addedBart Visscher2011-10-044-11/+59
| | |/ / | |/| |
* | | | Moved addScript and addStyle calls to app.phpTom Needham2011-10-052-5/+4
* | | | Cleanup of code. Fixed breadcrumb removal issueTom Needham2011-10-051-6/+3
* | | | use texteditor for search resultsRobin Appelman2011-10-052-3/+14
* | | | remove now unneeded textviewerRobin Appelman2011-10-0551-5853/+0
* | | | move some code to where it belongs and remove duplicated editor appRobin Appelman2011-10-0557-20160/+13
* | | | Added all the remaining extensions to filetypesFlorian Jacob2011-10-051-5/+21
* | | | Control events are now bound on the page load rather than everytime the edito...Tom Needham2011-10-041-1/+4
* | | | Save button now removed after closing editorTom Needham2011-10-041-0/+1
* | | | fixed another bug with breadcrumbsMarvin Thomas Rabe2011-10-041-1/+1
* | | | fixed scrollbar issues. fixed missing breadcrumb image.Marvin Thomas Rabe2011-10-042-12/+6
* | | | Added fillHeight() js function for resizing editorTom Needham2011-10-042-7/+8
* | | | Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editorTom Needham2011-10-0421-84/+129
|\| | |
| * | | remeber cookie bug fixedMarvin Thomas Rabe2011-10-041-0/+3
| * | | Merge branch 'master' of gitorious.org:owncloud/owncloudMarvin Thomas Rabe2011-10-0412-42/+40
| |\ \ \ | | | |/ | | |/|