summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* removed description field for calendarMarvin Thomas Rabe2011-10-089-41/+15
* added missing filesMarvin Thomas Rabe2011-10-082-0/+27
* moved bookmarklet to personal. username must be provided when adding a new user.Marvin Thomas Rabe2011-10-084-23/+20
* added code and license links next to version numberJan-Christoph Borchardt2011-10-082-3/+2
* Revert "support of RRULE in calendar app"Jan-Christoph Borchardt2011-10-081-665/+34
* Fixes for adding contact propertyBart Visscher2011-10-074-3/+4
* Display contact name without label and in boldBart Visscher2011-10-071-2/+2
* Save the right contact propertyBart Visscher2011-10-071-1/+1
* Fix saving properties with a new contactBart Visscher2011-10-071-0/+11
* Fix name when adding contactBart Visscher2011-10-071-1/+2
* fix amapache urlRobin Appelman2011-10-071-1/+1
* fixes for the mimetype iconsRobin Appelman2011-10-0713-7/+7
* 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
| | * | 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/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
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| |/ /
| * | remeber cookie bug fixedMarvin Thomas Rabe2011-10-041-0/+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-043-34/+44