summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #4173 from owncloud/login-cleanupJan-Christoph Borchardt2013-07-246-91/+274
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | merge masterJan-Christoph Borchardt2013-07-24176-2743/+13436
| |\ \ \ \ \
| * | | | | | slight dark inset text shadow for warnings to increase legibilityJan-Christoph Borchardt2013-07-241-0/+1
| * | | | | | Bring the NoiseJan-Christoph Borchardt2013-07-231-9/+9
| * | | | | | remove superfluous importantJan-Christoph Borchardt2013-07-231-1/+1
| * | | | | | fix browser rendering issuesJan-Christoph Borchardt2013-07-231-2/+8
| * | | | | | larger log in and installation buttonsJan-Christoph Borchardt2013-07-231-1/+3
| * | | | | | better whitespace for footerJan-Christoph Borchardt2013-07-231-5/+3
| * | | | | | cleaner look and code for primary buttonJan-Christoph Borchardt2013-07-231-10/+18
| * | | | | | input fields work on any background nowJan-Christoph Borchardt2013-07-231-15/+19
| * | | | | | add some padding to footerJan-Christoph Borchardt2013-07-231-2/+8
| * | | | | | adjust labels and input field groupsJan-Christoph Borchardt2013-07-233-39/+64
| * | | | | | shorten wording on config directory errorsJan-Christoph Borchardt2013-07-232-2/+4
| * | | | | | more beautiful warningsJan-Christoph Borchardt2013-07-231-13/+27
| * | | | | | fix and checkstyle for show password toggleJan-Christoph Borchardt2013-07-231-10/+40
| * | | | | | increase button size, adjust remember checkboxJan-Christoph Borchardt2013-07-231-2/+2
| * | | | | | move log in button CSS to appropriate placeJan-Christoph Borchardt2013-07-231-4/+18
| * | | | | | adjust text colors for remember and footerJan-Christoph Borchardt2013-07-231-3/+8
| * | | | | | larger clickable area for remember log inJan-Christoph Borchardt2013-07-231-0/+3
| * | | | | | 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