summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | sticky footerJan-Christoph Borchardt2013-07-232-10/+26
| * | | | | | primary button adjustmentsJan-Christoph Borchardt2013-07-231-2/+6
| * | | | | | input field adjustments for new full-color background on log inJan-Christoph Borchardt2013-07-232-9/+33
| * | | | | | fix general reset CSS issue which caused gradient background to cut offJan-Christoph Borchardt2013-07-231-1/+1
| * | | | | | rip out unneeded #login div, replace with existing body-loginJan-Christoph Borchardt2013-07-232-29/+47
| * | | | | | initial WIP for cleaner log in pageJan-Christoph Borchardt2013-07-231-11/+14
* | | | | | | update 3rdparty repoThomas Müller2013-07-241-0/+0
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #4175 from owncloud/remember-checkedJan-Christoph Borchardt2013-07-241-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'master' into remember-checkedJan-Christoph Borchardt2013-07-243-18/+4
| |\ \ \ \ \
| * | | | | | check remember log in by default, ref #3918Jan-Christoph Borchardt2013-07-241-2/+2
* | | | | | | Merge pull request #4177 from owncloud/move_defaults_to_template_constructorBjörn Schießle2013-07-2412-46/+35
|\ \ \ \ \ \ \
| * | | | | | | use OC_Defaults directly from the templateBjörn Schießle2013-07-242-4/+4
| * | | | | | | Merge branch 'master' into move_defaults_to_template_constructorBjörn Schießle2013-07-241-2/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | initialize OC_Defaults in template constructorXBjörn Schießle2013-07-2410-42/+31
* | | | | | | | Merge pull request #3995 from owncloud/groupsicewind19912013-07-249-176/+1202
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into groupsThomas Müller2013-07-249-390/+571
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'master' into groupsRobin Appelman2013-07-231561-16146/+93330
| |\ \ \ \ \ \ \
| * | | | | | | | group: only pass backends that hold that specific group to the group constructorRobin Appelman2013-07-184-11/+13
| * | | | | | | | reneme id to gidRobin Appelman2013-07-101-15/+15
| * | | | | | | | more consistent namingRobin Appelman2013-07-103-8/+8
| * | | | | | | | consistent namingRobin Appelman2013-07-101-6/+6
| * | | | | | | | search parameter is not optionalRobin Appelman2013-07-101-2/+2
| * | | | | | | | add test case for getting group after deleting itRobin Appelman2013-07-101-0/+16
| * | | | | | | | more consitency in hook namesRobin Appelman2013-07-102-9/+9
| * | | | | | | | cant use private members from closure in php <5.4Robin Appelman2013-07-101-3/+3
| * | | | | | | | use new group api as backend for the old apiRobin Appelman2013-07-102-173/+160
| * | | | | | | | update group managementRobin Appelman2013-07-107-3/+1024
* | | | | | | | | Merge pull request #4176 from owncloud/fixing-broken-masterThomas Müller2013-07-241-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | fix php syntaxThomas Müller2013-07-241-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #4171 from owncloud/fix-configMorris Jobke2013-07-242-16/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | ignore config read failuresBart Visscher2013-07-231-1/+2
| * | | | | | | Revert "fix failing master branch - Test_Config::testWriteData"Bart Visscher2013-07-232-16/+1
* | | | | | | | Merge pull request #4030 from owncloud/more-themable-stringsJan-Christoph Borchardt2013-07-2411-34/+54
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into more-themable-stringsThomas Müller2013-07-241510-15372/+93481
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-24103-1498/+3059
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge pull request #4090 from owncloud/cleanup-some-template-functionsThomas Müller2013-07-239-390/+571
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Change to use !== and ===Bart Visscher2013-07-212-6/+6
| * | | | | | | fixing typos, PHPDoc and missing namespace \Thomas Müller2013-07-214-10/+11
| * | | | | | | Move basic template functions to their own classBart Visscher2013-07-213-165/+205
| * | | | | | | Move template functions to there own fileBart Visscher2013-07-212-112/+121
| * | | | | | | Split locating JS and CSS files to their own classBart Visscher2013-07-215-104/+235
* | | | | | | | Merge pull request #3392 from owncloud/googledriveBart Visscher2013-07-2339-599/+8529
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Remove root option from Google Drive storage, because it is only used for tes...Michael Gapczynski2013-07-232-10/+8
| * | | | | | | Fix 'most' Google Drive testsMichael Gapczynski2013-07-132-82/+148
| * | | | | | | Merge branch 'master' into googledriveThomas Müller2013-07-121433-32503/+55405
| |\ \ \ \ \ \ \
| * | | | | | | | substr storage id to prevent problems with storing the change id in appconfigMichael Gapczynski2013-06-041-1/+1
| * | | | | | | | Implement hasUpdated() to watch for changes on Google Drive sideMichael Gapczynski2013-05-301-0/+59
| * | | | | | | | Merge branch 'master' into googledriveMichael Gapczynski2013-05-30820-36215/+7062
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into googledriveMichael Gapczynski2013-05-271260-19374/+38600
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return null if file size is negative for WebDAV, fix #2013Michael Gapczynski2013-05-271-2/+5