summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* master is now on the way to ownCloud 3v3.0alpha1Frank Karlitschek2011-10-101-2/+2
* Merge branch 'master' of gitorious.org:owncloud/owncloudGeorg Ehrke2011-10-101-1/+9
|\
| * add owncloud autosetup optionThomas Schmidt2011-10-101-1/+9
* | reload calendar automaticallyGeorg Ehrke2011-10-101-0/+1
|/
* fix webfinger install scriptMichiel@unhosted2011-10-091-1/+2
* Merge branch 'master' of gitorious.org:owncloud/owncloudMichiel@unhosted2011-10-0996-975/+357
|\
| * Move contact delete button to top right cornerBart Visscher2011-10-092-1/+2
| * Show add contact form on opening contacts pageBart Visscher2011-10-092-8/+1
| * apps/bookmarks: remove unused variableFlorian Pritz2011-10-081-2/+0
| * apps/bookmarks: follow redirects when fetching titleFlorian Pritz2011-10-081-1/+48
| * webkit searchfield bug fixedMarvin Thomas Rabe2011-10-081-0/+1
| * removed description. changed target to _blank. removed sorting. updated layout.Marvin Thomas Rabe2011-10-0811-105/+41
| * 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 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
| | * | | 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
* | | | | | use install.php properlyMichiel@unhosted2011-10-093-12/+6
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'master' of gitorious.org:owncloud/owncloudGeorg Ehrke2011-10-0619-65/+137
|\ \ \ \ \ | | |_|_|/ | |/| | |