summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Change colorselector to use border for selected colorBart Visscher2011-10-072-5/+3
* conflicts solvedMarvin Thomas Rabe2011-10-0610-70/+684
|\
| * Add icon for calendar color selectorBart Visscher2011-10-061-1/+1
| * 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-0612-53/+85
| |\
| * | 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-067-59/+37
|\ \ \
| * | | BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.Stephen Rees-Carter2011-10-061-24/+26
| | |/ | |/|
| * | another query fixBartek Przybylski2011-10-051-1/+1
| * | 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
* | | 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/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
| |/ /
| * | 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
* | | updated marginsMarvin Thomas Rabe2011-10-042-4/+3
|/ /
* | Merge branch 'master' of gitorious.org:owncloud/owncloudMarvin Thomas Rabe2011-10-0412-42/+40
|\|
| * Merge branch 'master' of gitorious.org:owncloud/owncloudGeorg Ehrke2011-10-0411-39/+32
| |\
| | * renamed unhosted to remoteStorage (needs to be updated with coming protocol v...Jan-Christoph Borchardt2011-10-0411-39/+32
| * | fix ical importGeorg Ehrke2011-10-041-3/+8
| |/
* | updated calendar settingsMarvin Thomas Rabe2011-10-041-29/+36
* | fixed scrollbar issuesMarvin Thomas Rabe2011-10-041-1/+1
|/
* fix checkLoggedIn function in import of ical filesGeorg Ehrke2011-10-031-1/+1
* added import function as filehandlerGeorg Ehrke2011-10-036-87/+158
* Add user friendly calendar color chooserBart Visscher2011-10-035-3/+53
* Take setting default value out of loopBart Visscher2011-10-031-2/+2
* Merge commit 'refs/merge-requests/51' of git://gitorious.org/owncloud/ownclou...Marvin Thomas Rabe2011-10-031-4/+4
|\
| * fix add bookmark bug.Weng Xuetian2011-10-031-4/+4
* | Merge branch 'master' of git://gitorious.org/owncloud/owncloudMarvin Thomas Rabe2011-10-0316-0/+598
|\|
| * show galleries in search resultsRobin Appelman2011-10-021-0/+14
| * enable by defaultFrank Karlitschek2011-10-021-0/+1
| * adding tmp icon for app, extending memory size for php in .htaccessBartek Przybylski2011-10-021-1/+1
| * adding missing files, don know why they disappearedBartek Przybylski2011-10-022-0/+68
| * merge 'gallery_app_devel' to 'master'Bartek Przybylski2011-10-0214-0/+515
| |\
| | * avoid creating empty albums, removing od depreciated code openingsBartek Przybylski2011-10-023-6/+6
| | * changing <? to <?phpBartek Przybylski2011-10-029-9/+9
| | * removing add new album button, removing logs, and unused codeBartek Przybylski2011-10-013-4/+1
| | * showing galleries bahaviour changeBartek Przybylski2011-10-016-44/+180
* | | Added translatable text.Marvin Thomas Rabe2011-10-023-13/+13
* | | Add translation and fixed some css problemsMarvin Thomas Rabe2011-10-021-1/+1
* | | Changed multiple select for days of weekend to 'chosen'. Cleaned up some code...Marvin Thomas Rabe2011-10-022-16/+11
|/ /
* | Merge commit 'refs/merge-requests/39' of git://gitorious.org/owncloud/owncloudRobin Appelman2011-10-022-21/+18
|\ \
| * | bookmarks are now translatableMarvin Thomas Rabe2011-10-012-21/+18
* | | added function to export single eventsGeorg Ehrke2011-10-012-10/+25