summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | rename to apps.jsBernhard Posselt2014-05-262-1/+1
| * | | | | | | query buttons on every click to not worry about weird edge case scenariosBernhard Posselt2014-05-241-19/+5
| * | | | | | | use different nsBernhard Posselt2014-05-241-1/+1
| * | | | | | | allow apps to add buttons on runtime without negatively impacting performanceBernhard Posselt2014-05-241-4/+17
| * | | | | | | add ; to make jshint happyBernhard Posselt2014-05-231-1/+1
| * | | | | | | remove unecessary parenthsBernhard Posselt2014-05-231-2/+2
| * | | | | | | add a slideup mechanismBernhard Posselt2014-05-232-0/+66
* | | | | | | | Merge pull request #8853 from owncloud/design-typefaceJan-Christoph Borchardt2014-06-048-3/+236
|\ \ \ \ \ \ \ \
| * | | | | | | | IE -> IE8 onlyMorris Jobke2014-06-041-1/+1
| * | | | | | | | move from tff to woff and fix IE8Morris Jobke2014-06-047-6/+14
| * | | | | | | | unbold the usernameJan-Christoph Borchardt2014-06-031-1/+0
| * | | | | | | | do not use italic typeface style, instead lighter colorJan-Christoph Borchardt2014-06-031-0/+9
| * | | | | | | | use Open Sans as typefaceJan-Christoph Borchardt2014-06-036-1/+218
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #8860 from owncloud/phpstorm-code-styleMorris Jobke2014-06-041-0/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | add phpstorm code styleRobin Appelman2014-06-041-0/+51
|/ / / / / / / /
* | | | | | | | Merge pull request #8662 from owncloud/f-lockThomas Müller2014-06-0418-34/+703
|\ \ \ \ \ \ \ \
| * | | | | | | | workaround to get the unit test goingThomas Müller2014-06-041-4/+6
| * | | | | | | | get the storage from the viewBjoern Schiessle2014-06-041-4/+5
| * | | | | | | | Use ->instanceOfStorage() not instanceof for Storage instances.ringmaster2014-06-041-1/+1
| * | | | | | | | Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStora...ringmaster2014-06-042-6/+6
| * | | | | | | | only lock if unlink is called for a fileBjoern Schiessle2014-06-041-1/+3
| * | | | | | | | fix unit test after adding the additional parameter to addStorageWrapper()Bjoern Schiessle2014-06-041-1/+1
| * | | | | | | | name the storage wrapper to make sure that we don't apply the wrapper multipl...Bjoern Schiessle2014-06-043-6/+6
| * | | | | | | | don't ask for fileInfo if we already have oneBjoern Schiessle2014-06-041-5/+4
| * | | | | | | | Normalize lock exception messages.ringmaster2014-06-042-2/+2
| * | | | | | | | make sure to close the stream at the end of each testBjoern Schiessle2014-06-041-0/+6
| * | | | | | | | Restore the reference to this used exception class.ringmaster2014-06-041-0/+1
| * | | | | | | | Move Lock to private namespace, add interface. Update PHPDoc.ringmaster2014-06-043-255/+316
| * | | | | | | | Don't error out on console.ringmaster2014-06-041-2/+2
| * | | | | | | | Removed unused vars/declarations, update PHPDoc.ringmaster2014-06-042-3/+3
| * | | | | | | | Fix typoLukas Reschke2014-06-041-1/+1
| * | | | | | | | Fix typoLukas Reschke2014-06-041-1/+1
| * | | | | | | | Remove unused methods.ringmaster2014-06-041-14/+0
| * | | | | | | | Respect locked files, surface correct exception.ringmaster2014-06-042-6/+43
| * | | | | | | | Simpler log unique id.ringmaster2014-06-041-1/+1
| * | | | | | | | Add actual locking and log changes necessary for debugging.ringmaster2014-06-043-28/+304
| * | | | | | | | Continued flock work.ringmaster2014-06-044-24/+64
| * | | | | | | | flock changes. Work in progress.ringmaster2014-06-047-1/+259
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #8842 from owncloud/ldap_cli_methodsThomas Müller2014-06-045-1/+232
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix casing and PHPDocThomas Müller2014-06-034-8/+7
| * | | | | | | | fix description textsArthur Schiwon2014-06-032-2/+2
| * | | | | | | | command line tools to see, modify and test existing LDAP configurationsArthur Schiwon2014-06-035-1/+233
* | | | | | | | | Merge pull request #8849 from owncloud/trash_expire_fixThomas Müller2014-06-041-8/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixing typoThomas Müller2014-06-041-1/+1
| * | | | | | | | | get files in trash from file cacheBjoern Schiessle2014-06-031-7/+8
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #8468 from owncloud/remove-infieldlabelsJan-Christoph Borchardt2014-06-0418-270/+542
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | move to updated version of placeholderMorris Jobke2014-06-036-22/+481
| * | | | | | | | | fix text alignment in input fieldsJan-Christoph Borchardt2014-06-031-1/+1
| * | | | | | | | | fix icon alignment in input fieldsJan-Christoph Borchardt2014-06-031-2/+2
| * | | | | | | | | add missing placeholder shim for change password fields in IE8/9Jan-Christoph Borchardt2014-06-031-0/+2