summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | More js updates for app/type in OCCategoriesThomas Tanghus2012-10-191-11/+11
| * | | | | | | | | | | | | | | | | | | | | Use get for loading dialog.Thomas Tanghus2012-10-191-1/+1
| * | | | | | | | | | | | | | | | | | | | | White space fix.Thomas Tanghus2012-10-191-69/+69
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-19234-4855/+3893
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | FormattingThomas Tanghus2012-10-191-3/+1
| * | | | | | | | | | | | | | | | | | | | | | Add favorite handling methods to OC_VCategories.Thomas Tanghus2012-10-191-1/+98
| * | | | | | | | | | | | | | | | | | | | | | Use consts all places and rename some daft method names.Thomas Tanghus2012-10-191-22/+28
| * | | | | | | | | | | | | | | | | | | | | | Updated category js for handling favorites and use post instead of get.Thomas Tanghus2012-10-191-18/+43
| * | | | | | | | | | | | | | | | | | | | | | Added ajax files for favorite category handling.Thomas Tanghus2012-10-193-0/+113
| * | | | | | | | | | | | | | | | | | | | | | Updated category ajax files to use type instead of app and add callCheck.Thomas Tanghus2012-10-193-25/+35
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-173-17/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-1711-12/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-17853-133798/+2752
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-16119-1410/+7138
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-15266-5363/+8075
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-1151-509/+614
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-10292-35828/+3421
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-0540-238/+370
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-0314-27/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-02149-2473/+4072
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added post_deleteUser hook to VCategories. Added methods for adding/removing ...Thomas Tanghus2012-10-021-6/+110
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-0132-124/+230
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-09-30668-7715/+22511
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-09-17196-1742/+1929
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added separate table for OC_VCategories and category/object (event/contact et...Thomas Tanghus2012-09-172-47/+430
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added methods OC_DB::insertIfNotExist() and OCP\DB::insertIfNotExist().Thomas Tanghus2012-09-172-0/+70
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-14137-243/+312
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use util function to protect datadirectory in setupBart Visscher2012-11-131-3/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-1392-1645/+1931
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #319 from owncloud/fileactions_newfileicewind19912012-11-121-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add actions to newly created files and foldersRobin Appelman2012-11-071-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reuse jquery object when adding files to the file listRobin Appelman2012-11-071-6/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #157 from owncloud/setupBart Visscher2012-11-123-54/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DRY for creating htaccess to protect data-directoryBart Visscher2012-10-302-3/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate control code from class definitionBart Visscher2012-10-303-51/+54
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deleting multiple user w-o reloading V2Brice Maron2012-11-121-1/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP: cherrypick objectGUID handling from stable45, was part of PR 344Arthur Schiwon2012-11-121-1/+35
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #368 from butonic/i18n_of_cancel_buttonLukas Reschke2012-11-121-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add i18n for cancel buttonJörn Friedrich Dreyer2012-11-121-2/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #371 from butonic/sql_and_error_log_fixesblizzz2012-11-121-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add missing sql backticks, check sharing for error and add logJörn Friedrich Dreyer2012-11-121-2/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-1225-80/+127
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #361 from owncloud/cruds_consts_2Thomas Tanghus2012-11-1112-105/+141
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*Thomas Tanghus2012-11-1110-103/+99
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added CRUDS permissions to the OCP namespace. Implements issue #345Thomas Tanghus2012-11-112-2/+42
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #354 from michielbdejong/masterThomas Müller2012-11-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add /.well-known/host-meta.json to .htaccessMichiel de Jong2012-11-101-0/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-1118-37/+47
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable loading apps before starting testsBart Visscher2012-11-101-0/+2