summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add GroupList Ajax to Users.raghunayyar2014-06-023-1/+78
* Splits Controls overlap in files and users.raghunayyar2014-06-023-2/+12
* resolve conflicts while picking c0fb623raghunayyar2014-06-023-30/+48
* Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579Arthur Schiwon2014-06-022-13/+31
* Merge pull request #8718 from owncloud/share_icons_for_shared_byVincent Petry2014-06-021-13/+31
|\
| * add share icons for folders shared by the current userBjoern Schiessle2014-05-301-13/+31
* | Merge pull request #8443 from owncloud/csrf-on-login-and-logoutVincent Petry2014-06-023-1/+14
|\ \
| * \ Merge branch 'master' into csrf-on-login-and-logoutThomas Müller2014-05-191565-36600/+68630
| |\ \
| * | | Redirect to index if the logout link is accessed without valid sessionLukas Reschke2014-05-111-0/+8
| * | | Add CSRF check on login and logoutLukas Reschke2014-05-043-1/+6
* | | | Merge pull request #8807 from owncloud/add_filecache_indexVincent Petry2014-06-021-0/+15
|\ \ \ \
| * | | | add another index to the filecache to reduce the number of queries without a ...Frank Karlitschek2014-05-311-0/+15
* | | | | Merge pull request #8187 from owncloud/escape-more-characterMorris Jobke2014-06-022-1/+12
|\ \ \ \ \
| * | | | | Fix typoLukas Reschke2014-05-311-1/+1
| * | | | | Add unit tests for escapeHTMLLukas Reschke2014-05-281-0/+11
| * | | | | Also encode > and 'Lukas Reschke2014-04-131-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0249-95/+105
* | | | | | Merge pull request #8811 from owncloud/fix-phpdoc-apBernhard Posselt2014-06-011-9/+1
|\ \ \ \ \ \
| * | | | | | Fix PHPDocLukas Reschke2014-06-011-9/+1
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-01367-2242/+2464
* | | | | | Merge pull request #8798 from owncloud/fix-corejsVincent Petry2014-05-311-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix undefined JS on login/setup pageVincent Petry2014-05-301-3/+3
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-31310-8947/+18171
* | | | | | Merge pull request #8800 from owncloud/db-changes-as-required-by-8483Thomas Müller2014-05-314-98/+65
|\ \ \ \ \ \
| * | | | | | - fix dropTable() and introduce tableExists()Thomas Müller2014-05-304-98/+65
| |/ / / / /
* | | | | | Merge pull request #8444 from owncloud/cleanup-list-codeThomas Müller2014-05-303-17/+14
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into cleanup-list-codeThomas Müller2014-05-191565-36596/+68631
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Add missing \Lukas Reschke2014-05-041-1/+1
| * | | | | | Cleanup code a little bitLukas Reschke2014-05-043-23/+15
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #7614 from owncloud/test_annotations_workingThomas Müller2014-05-303-0/+34
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | adding annotation check to checkServer()Thomas Müller2014-05-191-0/+6
| * | | | | Merge branch 'master' into test_annotations_workingThomas Müller2014-05-191535-35935/+67372
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | adopt new settings styleThomas Müller2014-05-091-2/+2
| * | | | | Check if ReflectionMethod::getDocComment is workingThomas Tanghus2014-05-093-0/+28
* | | | | | Merge pull request #8607 from owncloud/filescan_app_hookOwen Winkler2014-05-302-9/+46
|\ \ \ \ \ \
| * | | | | | Missed one.ringmaster2014-05-301-1/+1
| * | | | | | Updates per comments on PR:ringmaster2014-05-302-8/+22
| * | | | | | Prevent apps from affecting the scanner via hook.ringmaster2014-05-281-16/+18
| * | | | | | Use 'filesystem_check_enable' as a config option.ringmaster2014-05-272-5/+8
| * | | | | | Allow the default behavior to come from the config.ringmaster2014-05-271-6/+12
| * | | | | | Rename variable to something more appropriate.ringmaster2014-05-271-3/+3
| * | | | | | Allow apps to control via a hook to skip adding/removing a file during filescanringmaster2014-05-271-3/+15
* | | | | | | Merge pull request #8695 from owncloud/jserrorfixesLukas Reschke2014-05-301-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Fixed undefined object error that appears after a delayVincent Petry2014-05-231-2/+3
* | | | | | | | Merge pull request #8779 from owncloud/sel-webdav-onclickVincent Petry2014-05-301-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | select webdav address on clickVolkan Gezer2014-05-301-0/+3
* | | | | | | | | Merge pull request #8793 from owncloud/name-email-enter-preventVolkan Gezer2014-05-301-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | prevent pageload if pressed enter on name email changeVolkan Gezer2014-05-301-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #8663 from owncloud/files-dndissueLukas Reschke2014-05-304-6/+156
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix dropping files below the tableVincent Petry2014-05-224-5/+15