summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18609 from owncloud/login-layoutLukas Reschke2015-08-274-12/+64
|\ | | | | log in screen improvement & simplification
| * use simpler logo for log in pageJan-Christoph Borchardt2015-08-271-1/+3
| |
| * position and style remember button on log in pageJan-Christoph Borchardt2015-08-271-2/+4
| |
| * show feedback spinner for log in processJan-Christoph Borchardt2015-08-272-1/+26
| |
| * move log in button into fields and use icon instead of textJan-Christoph Borchardt2015-08-272-8/+31
| |
* | Merge pull request #18608 from owncloud/filetype-iconsMorris Jobke2015-08-2767-1852/+69
|\ \ | |/ |/| simpler style for filetype icons
| * simpler style for filetype iconsJan-Christoph Borchardt2015-08-2767-1852/+69
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-08-2722-8/+122
| |
* | Merge pull request #18574 from owncloud/update-eventsource-errorsRobin McCorkell2015-08-271-6/+20
|\ \ | | | | | | Properly show update exception in web UI
| * | Properly show update exceptionVincent Petry2015-08-261-1/+7
| | |
| * | Properly show token errors in ajax/update.php event sourceVincent Petry2015-08-261-5/+13
| | |
* | | Merge pull request #18582 from owncloud/be-consistentThomas Müller2015-08-261-2/+2
|\ \ \ | |_|/ |/| | Remove last occurence of `forcessl`
| * | Remove last occurence of `forcessl`Lukas Reschke2015-08-261-2/+2
| | | | | | | | | | | | This shoudl have been adjusted as well, now it's consistent with `setMagicInCookie`. While it does not have a security impact directly some automated scanners reported this all the time.
* | | Merge pull request #18587 from owncloud/list-highlightVincent Petry2015-08-261-15/+15
|\ \ \ | | | | | | | | reduce grey tones to one for list highlight
| * | | reduce grey tones to one for list highlightJan-Christoph Borchardt2015-08-261-15/+15
|/ / /
* | | Merge pull request #18514 from owncloud/app-navigation-styleMorris Jobke2015-08-2615-35/+30
|\ \ \ | | | | | | | | reduce grey tones in app navigation
| * | | reduce grey tones in app navigation, bubble menu and scrollbarJan-Christoph Borchardt2015-08-2615-35/+30
|/ / /
* | | Merge pull request #18573 from owncloud/search-styleJan-Christoph Borchardt2015-08-263-30/+14
|\ \ \ | | | | | | | | only show search icon on desktop, like on mobile
| * | | only show search icon on desktop, like on mobileJan-Christoph Borchardt2015-08-263-30/+14
| | |/ | |/|
* | | Merge pull request #18577 from owncloud/action-detailsMorris Jobke2015-08-266-59/+75
|\ \ \ | |_|/ |/| | file action detail style fixes
| * | fix unit testsMorris Jobke2015-08-262-10/+10
| | |
| * | properly shade file actions and menu items, don't differentiate between ↵Jan-Christoph Borchardt2015-08-263-31/+56
| | | | | | | | | | | | mobile and desktop
| * | fix share icons of shared items being placed off on mobileJan-Christoph Borchardt2015-08-261-2/+2
| | |
| * | remove border around bubble menuJan-Christoph Borchardt2015-08-261-12/+1
| | |
| * | proper padding and whitespace for share and more actionsJan-Christoph Borchardt2015-08-262-6/+9
| | |
| * | use same font-size for share action textJan-Christoph Borchardt2015-08-261-1/+0
| |/
* | Merge pull request #18580 from owncloud/remove-unused-translations-masterMorris Jobke2015-08-26190-2206/+24
|\ \ | | | | | | Remove unused translations master
| * | Adding simple script to remove language files from coreThomas Müller2015-08-261-0/+24
| | |
| * | Remove languages which are no longer maintained on transifexThomas Müller2015-08-26189-2206/+0
|/ /
* | Merge pull request #18042 from GreenArchon/masterMorris Jobke2015-08-262-7/+35
|\ \ | | | | | | Properly nest groups when using memberOf to detect group membership, …
| * | fix more review comments for #18042 / #17759Frédéric Fortier2015-08-071-4/+3
| | |
| * | Take review comments into consideration for pr #18042 / issue #17759Frédéric Fortier2015-08-041-16/+13
| | |
| * | Properly nest groups when using memberOf to detect group membership, fixes ↵Frédéric Fortier2015-08-032-7/+39
| | | | | | | | | | | | #17759
* | | Merge pull request #18576 from owncloud/update-maintenance-colorJan-Christoph Borchardt2015-08-261-1/+0
|\ \ \ | | | | | | | | Make maintenance/update text white
| * | | Make maintenance/update text whiteVincent Petry2015-08-261-1/+0
| | |/ | |/| | | | | | | | | | Removing the color makes it default to white as defined in the parent style.
* / | [tx-robot] updated from transifexJenkins for ownCloud2015-08-2658-6/+656
|/ /
* | Merge pull request #18569 from owncloud/files-dropdown-borderRaghu Nayyar2015-08-261-1/+1
|\ \ | | | | | | adjust dropdown borders to button borders
| * | adjust dropdown borders to button bordersChristoph Wurst2015-08-251-1/+1
| | |
* | | Merge pull request #18553 from owncloud/write-l10n-on-loginThomas Müller2015-08-261-4/+12
|\ \ \ | | | | | | | | Save detected l10n of browser on login
| * | | Save detected l10n of browser on loginMorris Jobke2015-08-251-4/+12
| | | | | | | | | | | | | | | | * fixes owncloud/activity#373
* | | | Merge pull request #17662 from owncloud/locking-dbThomas Müller2015-08-2610-43/+446
|\ \ \ \ | | | | | | | | | | Database backend for locking
| * | | | Adding path to log messageThomas Müller2015-08-251-1/+1
| | | | |
| * | | | log a warning while trying to acquire a db lock from within a transactionRobin Appelman2015-08-103-6/+18
| | | | |
| * | | | add method to check if we're inside a transactionRobin Appelman2015-08-103-0/+27
| | | | |
| * | | | cleanup empty locksRobin Appelman2015-08-101-0/+14
| | | | |
| * | | | more phpdocRobin Appelman2015-08-031-1/+1
| | | | |
| * | | | more phpdocRobin Appelman2015-08-031-1/+9
| | | | |
| * | | | rename path field to keyRobin Appelman2015-08-032-12/+18
| | | | |
| * | | | initialize unused (for now) ttl field to 0Robin Appelman2015-08-031-1/+1
| | | | |
| * | | | Fix db schemaRobin Appelman2015-08-035-12/+44
| | | | |