summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | remove tilde selector for IE8 compatibilityJan-Christoph Borchardt2014-06-031-2/+2
| * | | | remove scruntinizer config for infieldMorris Jobke2014-06-031-1/+0
| * | | | fix show password icon in personal settingsJan-Christoph Borchardt2014-06-031-2/+3
| * | | | infield label removal: remove last occurences of infield labelsJan-Christoph Borchardt2014-06-035-17/+10
| * | | | infield label removal: remove JS file and references to itJan-Christoph Borchardt2014-06-033-183/+0
| * | | | infield label removal: fix installation screenJan-Christoph Borchardt2014-06-032-15/+22
| * | | | first step of infield label removal, fix login screenJan-Christoph Borchardt2014-06-033-31/+25
| |/ / /
* | | / [tx-robot] updated from transifexJenkins for ownCloud2014-06-041011-35744/+38708
| |_|/ |/| |
* | | Merge pull request #8686 from owncloud/session-earlyMorris Jobke2014-06-031-0/+3
|\ \ \
| * | | Add some commentsRobin Appelman2014-06-031-0/+1
| * | | Make the session available as early as possibleRobin Appelman2014-05-231-0/+2
* | | | Merge pull request #8698 from owncloud/sharing_improve_permissionsThomas Müller2014-06-033-36/+30
|\ \ \ \
| * | | | check if it is a share storageBjoern Schiessle2014-06-021-1/+5
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 03:59:40 +0000