Commit Graph

13856 Commits (973bcccd7cc18867ea22c24f83421ed180b5022c)
 

Author SHA1 Message Date
Christopher ae4775a683 Merge pull request #4906 from owncloud/wtf-broken-code-was-merged-again-master 11 years ago
Thomas Müller de8d0783ed fixing syntax error - it it that hard to test own code? 11 years ago
Thomas Müller 43a96621ea adding comma to get cleaner diffs in the future 11 years ago
Thomas Müller 3c0e93e220 no file actions during upload 11 years ago
Thomas Müller 76f8be3b7a fixing namespaces and rename hasCategory to hasTag 11 years ago
Thomas Müller 690e98d45a Merge branch 'appframework-master' into vcategories_public 11 years ago
Thomas Müller 69c28400b4 Merge pull request #4886 from owncloud/public_cache 11 years ago
Thomas Müller 1274d6116d updating php docs 11 years ago
Jörn Friedrich Dreyer 72d53008cc indentation 11 years ago
Jenkins for ownCloud 6b1843d91b [tx-robot] updated from transifex 11 years ago
Jörn Friedrich Dreyer 7bd5e89f8c simplify conflict template handling, fix reopen after ESC 11 years ago
Jörn Friedrich Dreyer 12ff268e60 move upload dialog css to separate file 11 years ago
Jörn Friedrich Dreyer 64cc13a8d3 allow passing classes to buttons 11 years ago
Bart Visscher 817b8d151b Merge pull request #4745 from owncloud/split_personal-user_passwordchange 11 years ago
kondou 18a2c48ceb Translate errormsgs in settings/changepassword/controller 11 years ago
Thomas Tanghus 09d043729a Note to self 2: Do as you preach. Test! 11 years ago
Thomas Tanghus 79cd655920 Note to self: Test before pushing!!! 11 years ago
Jörn Friedrich Dreyer 715846626e hide excessive logging with a trace flag 11 years ago
Thomas Tanghus 2ef0b58ff6 Don't try to be clever 11 years ago
Jörn Friedrich Dreyer 17337b22af Merge branch 'master' into fix_3728_with_file_exists_dialog 11 years ago
Jörn Friedrich Dreyer ec1949f5ed Merge branch 'master' into fix_3728_with_file_exists_dialog 11 years ago
Jörn Friedrich Dreyer 1eb42626f5 Merge pull request #4769 from owncloud/gitignore_apps_fix 11 years ago
Jörn Friedrich Dreyer c531b4ef5b Merge pull request #4872 from owncloud/refactor_upload_progress 11 years ago
Thomas Tanghus dd62ccdb4e Merge branch 'appframework-master' into public_cache 11 years ago
Thomas Tanghus 534933ee9b Use new emitter system 11 years ago
Thomas Müller 20a43d1982 remove file action elements before recreating them 11 years ago
Thomas Müller 6ed2df11fc store the permissions retrieved via ajax within the dom element 11 years ago
Thomas Tanghus 442a2e074c Update to adhere to the coding guidelines. 11 years ago
Thomas Tanghus 6ba23912a7 Add getUserFolder/getAppFolder to Server. 11 years ago
Thomas Müller 415a27c1ae Merge pull request #4888 from owncloud/public_session 11 years ago
Thomas Tanghus d3f88ceeb4 Add some docs to the sessions interface. 11 years ago
Bjoern Schiessle 1a60aa2b6a only remember password if the user changes the permissions, otherwise the user disabled the password protection 11 years ago
Morris Jobke b54e9be0ac Merge pull request #4889 from owncloud/disable_avatar_loading_on_public_upload_page 11 years ago
Thomas Müller 370ed814f7 add permissions of the file to the json response 11 years ago
Björn Schießle e0f18ec72b Merge pull request #4708 from owncloud/encryption_fixes 11 years ago
Thomas Tanghus b0762ad3bf OC_VCategories=>OC\Tags. Public interface + getter in server container 11 years ago
Thomas Tanghus e760343b98 Merge branch 'appframework-master' into vcategories_public 11 years ago
Thomas Tanghus 8b4f4a79e2 Still some session leftovers. 11 years ago
Jörn Friedrich Dreyer 342a420eba disable avatar loading on public guest page 11 years ago
Jörn Friedrich Dreyer e43e961dcb we cannot load avatar on guest page 11 years ago
Jörn Friedrich Dreyer 3f7f6434d1 Merge branch 'master' into fix_3728_with_file_exists_dialog 11 years ago
Jörn Friedrich Dreyer 86c4c83b86 use exists 11 years ago
Jörn Friedrich Dreyer b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog 11 years ago
Jörn Friedrich Dreyer c2e413e852 add fixme 11 years ago
Jörn Friedrich Dreyer 8bdafaf4e0 make 'open in folder' action default for files 11 years ago
Jörn Friedrich Dreyer 00772a8470 use correct doublequotes in template, remove container 11 years ago
Jörn Friedrich Dreyer b40925ae17 initial scrollto implementation: 11 years ago
Thomas Tanghus 5bddb5377a Purge session from Request - and fix some styles 11 years ago
Thomas Tanghus 5c19b995db Add interface for Session and add getter in server container. 11 years ago
Bjoern Schiessle 642b064c5b we can leave the loop if the permission of the link share was checked 11 years ago