| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix sorting of apps | Robin Appelman | 2014-06-03 | 1 | -1/+5 |
| | | |||||
| * | Prevent js error | Robin Appelman | 2014-06-03 | 1 | -1/+3 |
| | | |||||
| * | Fix phpdoc | Robin Appelman | 2014-06-03 | 1 | -1/+1 |
| | | |||||
| * | Add option to enable app for specific groups | Robin Appelman | 2014-06-03 | 5 | -9/+86 |
| | | |||||
| * | Trigger change event on multiselect change | Robin Appelman | 2014-06-03 | 1 | -0/+1 |
| | | |||||
| * | Allow enabling apps by group by setting the config value to a json encoded ↵ | Robin Appelman | 2014-06-03 | 1 | -248/+258 |
| | | | | | array of groups | ||||
| * | Merge pull request #8806 from owncloud/add_share_index | Morris Jobke | 2014-06-02 | 1 | -0/+12 |
| |\ | | | | | add share index | ||||
| | * | add share index | Frank Karlitschek | 2014-05-31 | 1 | -0/+12 |
| | | | |||||
| * | | Merge pull request #8676 from owncloud/encryption_improvements | Morris Jobke | 2014-06-02 | 4 | -155/+102 |
| |\ \ | | | | | | | cleanup encryption code, improved return codes | ||||
| | * | | ceanup encryption code, improved return codes | Bjoern Schiessle | 2014-06-02 | 4 | -155/+102 |
| | | | | |||||
| * | | | Merge pull request #8613 from owncloud/filesize-alignment | Morris Jobke | 2014-06-02 | 4 | -3/+24 |
| |\ \ \ | | | | | | | | | Improve aligment of file size | ||||
| | * | | | display "<1 kB" for really small files | Morris Jobke | 2014-06-02 | 4 | -3/+24 |
| | | | | | | | | | | | | | | | | | | | | | * added parameters for humanFileSize to trigger that behaviour * add unit tests for that | ||||
| * | | | | Merge pull request #8712 from owncloud/l10n-fully-translatable-webdav | Frank Karlitschek | 2014-06-02 | 4 | -5/+5 |
| |\ \ \ \ | | | | | | | | | | | fully translatable user_webdav | ||||
| | * | | | | document always links to the current version of OC | Volkan Gezer | 2014-05-29 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | fully translatable user_webdav | Volkan Gezer | 2014-05-29 | 4 | -5/+5 |
| | | | | | | |||||
| * | | | | | Merge pull request #8784 from owncloud/fold-reshare-settings | Morris Jobke | 2014-06-02 | 2 | -10/+11 |
| |\ \ \ \ \ | | | | | | | | | | | | | make reshare settings foldable | ||||
| | * | | | | | make reshare settings foldable | Volkan Gezer | 2014-05-29 | 2 | -10/+11 |
| | | | | | | | |||||
| * | | | | | | Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579 | Arthur Schiwon | 2014-06-02 | 2 | -13/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP: set filter mode to raw, so filters will not be changed and broken after upgrade from oc5, when visiting the LDAP settings and opening filter tabs get the correct version number for compare -.- bump version and don't overwrite values on next update if not necessary simpler and better readable assignment | ||||
| * | | | | | | Merge pull request #8718 from owncloud/share_icons_for_shared_by | Vincent Petry | 2014-06-02 | 1 | -13/+31 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | add share icons for folders shared by the current user | ||||
| | * | | | | | | add share icons for folders shared by the current user | Bjoern Schiessle | 2014-05-30 | 1 | -13/+31 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #8443 from owncloud/csrf-on-login-and-logout | Vincent Petry | 2014-06-02 | 3 | -1/+14 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add CSRF check on login and logout | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into csrf-on-login-and-logout | Thomas Müller | 2014-05-19 | 1565 | -36600/+68630 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/templates/login.php | ||||
| | * | | | | | | | | Redirect to index if the logout link is accessed without valid session | Lukas Reschke | 2014-05-11 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to prevent "Token expired" messages while login if a session is expired @see https://github.com/owncloud/core/pull/8443#issuecomment-42425583 | ||||
| | * | | | | | | | | Add CSRF check on login and logout | Lukas Reschke | 2014-05-04 | 3 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a minor issue and not worth a backport in my opinion as it could break more things than it's worth having it. | ||||
| * | | | | | | | | | Merge pull request #8807 from owncloud/add_filecache_index | Vincent Petry | 2014-06-02 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | add another index to the filecache to reduce the number of queries witho... | ||||
| | * | | | | | | | | | add another index to the filecache to reduce the number of queries without a ↵ | Frank Karlitschek | 2014-05-31 | 1 | -0/+15 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | matching index | ||||
| * | | | | | | | | | Merge pull request #8187 from owncloud/escape-more-character | Morris Jobke | 2014-06-02 | 2 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | Also encode > and ' | ||||
| | * | | | | | | | | Fix typo | Lukas Reschke | 2014-05-31 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add unit tests for escapeHTML | Lukas Reschke | 2014-05-28 | 1 | -0/+11 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Also encode > and ' | Lukas Reschke | 2014-04-13 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-02 | 49 | -95/+105 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #8811 from owncloud/fix-phpdoc-ap | Bernhard Posselt | 2014-06-01 | 1 | -9/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix PHPDoc | ||||
| | * | | | | | | | | | Fix PHPDoc | Lukas Reschke | 2014-06-01 | 1 | -9/+1 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove not anymore existing parameters - Fix typo | ||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-01 | 367 | -2242/+2464 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #8798 from owncloud/fix-corejs | Vincent Petry | 2014-05-31 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Fix undefined JS on login/setup page | ||||
| | * | | | | | | | | Fix undefined JS on login/setup page | Vincent Petry | 2014-05-30 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-31 | 310 | -8947/+18171 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #8800 from owncloud/db-changes-as-required-by-8483 | Thomas Müller | 2014-05-31 | 4 | -98/+65 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Database code cleanup | ||||
| | * | | | | | | | | | - fix dropTable() and introduce tableExists() | Thomas Müller | 2014-05-30 | 4 | -98/+65 |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - kill replaceDB() - this function is unused and it's implementation obviously wrong - add method annotation OC_DB_StatementWrapper::fetchAll - remove duplicate code in Test_DBSchema and reuse OC_DB::tableExists - remove unused variables | ||||
| * | | | | | | | | | Merge pull request #8444 from owncloud/cleanup-list-code | Thomas Müller | 2014-05-30 | 3 | -17/+14 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Cleanup code of files_sharing/ajax/ a little bit | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into cleanup-list-code | Thomas Müller | 2014-05-19 | 1565 | -36596/+68631 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/ajax/list.php | ||||
| | * | | | | | | | | | Add missing \ | Lukas Reschke | 2014-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Cleanup code a little bit | Lukas Reschke | 2014-05-04 | 3 | -23/+15 |
| | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use OCP\Response constants instead of the HTTP error code - Use checkAppEnabled() instead of OC_App::isEnabled with an if statement - Remove uneeded variable $baseURL - Rename $isvalid to $isValid | ||||
| * | | | | | | | | | Merge pull request #7614 from owncloud/test_annotations_working | Thomas Müller | 2014-05-30 | 3 | -0/+34 |
| |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Check if ReflectionMethod::getDocComment is working | ||||
| | * | | | | | | | | adding annotation check to checkServer() | Thomas Müller | 2014-05-19 | 1 | -0/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into test_annotations_working | Thomas Müller | 2014-05-19 | 1535 | -35935/+67372 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/util.php | ||||
| | * | | | | | | | | adopt new settings style | Thomas Müller | 2014-05-09 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Check if ReflectionMethod::getDocComment is working | Thomas Tanghus | 2014-05-09 | 3 | -0/+28 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #8607 from owncloud/filescan_app_hook | Owen Winkler | 2014-05-30 | 2 | -9/+46 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Allow apps to control via a hook skipping add/remove a file during filescan | ||||
| | * | | | | | | | | | Missed one. | ringmaster | 2014-05-30 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |