Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | More js updates for app/type in OCCategories | Thomas Tanghus | 2012-10-19 | 1 | -11/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | Use get for loading dialog. | Thomas Tanghus | 2012-10-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | White space fix. | Thomas Tanghus | 2012-10-19 | 1 | -69/+69 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-19 | 234 | -4855/+3893 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Formatting | Thomas Tanghus | 2012-10-19 | 1 | -3/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | Add favorite handling methods to OC_VCategories. | Thomas Tanghus | 2012-10-19 | 1 | -1/+98 | |
| * | | | | | | | | | | | | | | | | | | | | | | Use consts all places and rename some daft method names. | Thomas Tanghus | 2012-10-19 | 1 | -22/+28 | |
| * | | | | | | | | | | | | | | | | | | | | | | Updated category js for handling favorites and use post instead of get. | Thomas Tanghus | 2012-10-19 | 1 | -18/+43 | |
| * | | | | | | | | | | | | | | | | | | | | | | Added ajax files for favorite category handling. | Thomas Tanghus | 2012-10-19 | 3 | -0/+113 | |
| * | | | | | | | | | | | | | | | | | | | | | | Updated category ajax files to use type instead of app and add callCheck. | Thomas Tanghus | 2012-10-19 | 3 | -25/+35 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-17 | 3 | -17/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-17 | 11 | -12/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-17 | 853 | -133798/+2752 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-16 | 119 | -1410/+7138 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-15 | 266 | -5363/+8075 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-11 | 51 | -509/+614 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-10 | 292 | -35828/+3421 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-05 | 40 | -238/+370 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-03 | 14 | -27/+39 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-02 | 149 | -2473/+4072 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added post_deleteUser hook to VCategories. Added methods for adding/removing ... | Thomas Tanghus | 2012-10-02 | 1 | -6/+110 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-01 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-01 | 32 | -124/+230 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-09-30 | 668 | -7715/+22511 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-09-17 | 196 | -1742/+1929 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added separate table for OC_VCategories and category/object (event/contact et... | Thomas Tanghus | 2012-09-17 | 2 | -47/+430 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added methods OC_DB::insertIfNotExist() and OCP\DB::insertIfNotExist(). | Thomas Tanghus | 2012-09-17 | 2 | -0/+70 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-14 | 137 | -243/+312 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use util function to protect datadirectory in setup | Bart Visscher | 2012-11-13 | 1 | -3/+2 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-13 | 92 | -1645/+1931 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #319 from owncloud/fileactions_newfile | icewind1991 | 2012-11-12 | 1 | -6/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add actions to newly created files and folders | Robin Appelman | 2012-11-07 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reuse jquery object when adding files to the file list | Robin Appelman | 2012-11-07 | 1 | -6/+8 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #157 from owncloud/setup | Bart Visscher | 2012-11-12 | 3 | -54/+59 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DRY for creating htaccess to protect data-directory | Bart Visscher | 2012-10-30 | 2 | -3/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate control code from class definition | Bart Visscher | 2012-10-30 | 3 | -51/+54 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deleting multiple user w-o reloading V2 | Brice Maron | 2012-11-12 | 1 | -1/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP: cherrypick objectGUID handling from stable45, was part of PR 344 | Arthur Schiwon | 2012-11-12 | 1 | -1/+35 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #368 from butonic/i18n_of_cancel_button | Lukas Reschke | 2012-11-12 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add i18n for cancel button | Jörn Friedrich Dreyer | 2012-11-12 | 1 | -2/+5 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #371 from butonic/sql_and_error_log_fixes | blizzz | 2012-11-12 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add missing sql backticks, check sharing for error and add log | Jörn Friedrich Dreyer | 2012-11-12 | 1 | -2/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-12 | 25 | -80/+127 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #361 from owncloud/cruds_consts_2 | Thomas Tanghus | 2012-11-11 | 12 | -105/+141 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* | Thomas Tanghus | 2012-11-11 | 10 | -103/+99 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added CRUDS permissions to the OCP namespace. Implements issue #345 | Thomas Tanghus | 2012-11-11 | 2 | -2/+42 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #354 from michielbdejong/master | Thomas Müller | 2012-11-10 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add /.well-known/host-meta.json to .htaccess | Michiel de Jong | 2012-11-10 | 1 | -0/+1 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-11 | 18 | -37/+47 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable loading apps before starting tests | Bart Visscher | 2012-11-10 | 1 | -0/+2 |