Commit graph

5276 commits

Author SHA1 Message Date
Morris Jobke
9fd2be0757 Merge pull request #3406 from owncloud/oc_dialogs_oc_template
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
Jenkins for ownCloud
d590064fdf [tx-robot] updated from transifex 2013-05-22 02:19:52 +02:00
Jenkins for ownCloud
afdad5c74d [tx-robot] updated from transifex 2013-05-21 02:04:52 +02:00
Jenkins for ownCloud
6609de28d8 [tx-robot] updated from transifex 2013-05-20 02:10:11 +02:00
Jenkins for ownCloud
694f42dfd5 [tx-robot] updated from transifex 2013-05-19 02:01:55 +02:00
Jenkins for ownCloud
9428d813ba [tx-robot] updated from transifex 2013-05-18 02:03:28 +02:00
Thomas Tanghus
152e275c8a Various cleanups in OC.dialogs 2013-05-17 04:54:08 +02:00
Jenkins for ownCloud
6a6079176b [tx-robot] updated from transifex 2013-05-17 02:07:36 +02:00
blizzz
2d51eefcb8 Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuid
Ldap configurable username n uuid
2013-05-16 05:40:31 -07:00
Jenkins for ownCloud
966c2231e3 [tx-robot] updated from transifex 2013-05-16 02:01:37 +02:00
Jenkins for ownCloud
6a788d1a54 [tx-robot] updated from transifex 2013-05-15 02:02:45 +02:00
Thomas Müller
fdef2a373a Merge pull request #2821 from owncloud/fix-2159-rename-to-shared
fix allowed rename of folder in root directory to reserved name "Shared"
2013-05-14 13:13:16 -07:00
Björn Schießle
96ff19a703 fix history template, print_unescaped() needs to include closing tags 2013-05-14 21:22:30 +02:00
Raghu Nayyar
418503a4ad Merge pull request #3338 from owncloud/button_color_fix
Keeping Font Colors Consistant on the headers.
2013-05-14 09:52:54 -07:00
Morris Jobke
784f117ec2 Merge pull request #3330 from owncloud/preselect_filename_on_rename
peselect filename without extension on rename
2013-05-14 06:16:30 -07:00
Morris Jobke
0d8fa2eb98 [files] add private declaration of $view 2013-05-14 12:49:23 +02:00
raghunayyar
18618c75aa color change to crumb elements as well. 2013-05-14 11:07:12 +05:30
raghunayyar
6d95d130e4 Keeping Font Colors Consistant on the headers. 2013-05-13 23:12:05 +05:30
Jörn Friedrich Dreyer
591b383f2d peselect filename without extension on rename 2013-05-13 15:54:45 +02:00
Arthur Schiwon
beaa10b823 Merge branch 'master' into ldap_configurable_username_n_uuid 2013-05-13 12:41:22 +02:00
Björn Schießle
0ef8590773 Merge branch 'master' into update_etags_on_restore 2013-05-13 10:48:06 +02:00
Jenkins for ownCloud
e8c154f341 [tx-robot] updated from transifex 2013-05-13 02:10:20 +02:00
Morris Jobke
e2bd32323d [files] fix mock creation and remove hardcoded 'require' statement 2013-05-12 13:02:01 +02:00
Morris Jobke
b777c0fd75 [files] rename lib to "App" 2013-05-12 11:47:22 +02:00
Morris Jobke
b32c30b6d0 [files] ownCloud typo 2013-05-12 11:47:22 +02:00
Morris Jobke
7e23e97676 [files] rename test class and add rename test 2013-05-12 11:47:22 +02:00
Morris Jobke
d4ba9cf338 [files] remove realpath in test 2013-05-12 11:47:22 +02:00
Morris Jobke
bb5554de7f [files] rename tests 2013-05-12 11:47:22 +02:00
Morris Jobke
b9f426b1d7 [files] remove normalizePath on rename and dependency injection 2013-05-12 11:47:22 +02:00
Morris Jobke
324c423548 [files] kill stripslashes 2013-05-12 11:47:22 +02:00
Morris Jobke
418e878ba8 [files] fix typos 2013-05-12 11:47:22 +02:00
Morris Jobke
1020d5c16c [files] refactoring 2013-05-12 11:47:22 +02:00
Morris Jobke
33b31931bd string comparision 2013-05-12 11:47:22 +02:00
Morris Jobke
b393c91a96 wrong root dir name 2013-05-12 11:47:22 +02:00
Morris Jobke
a878bd9923 fix allowed rename of folder in root directory to reserved name "Shared"
refs #2159
2013-05-12 11:47:22 +02:00
Jenkins for ownCloud
74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
Björn Schießle
cc433d47cb touch() needs to be performed relative to user/files otherwise ownCloud doesn't execute the hooks which means that etags aren't updated properly 2013-05-10 12:05:11 +02:00
Björn Schießle
bda8187f3b rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file 2013-05-08 23:00:13 +02:00
Björn Schießle
b9134dcd6a touch file relative to users file folder, otherwise the hooks will be ignored 2013-05-08 22:59:49 +02:00
Arthur Schiwon
d69579f773 LDAP: fix display of numerical display names 2013-05-08 17:54:38 +02:00
Arthur Schiwon
796ee8c4c0 LDAP: Implement clear mappings functionality 2013-05-08 17:47:07 +02:00
Arthur Schiwon
3f1717d3d5 LDAP: implement UUID and internal username override 2013-05-08 14:56:52 +02:00
Arthur Schiwon
c9b3da5bbc LDAP: better variable name 2013-05-08 14:55:56 +02:00
Arthur Schiwon
bc23010670 LDAP: implement r+w for new settings 2013-05-08 14:05:08 +02:00
Arthur Schiwon
c18158906c LDAP: add settings for UUID override 2013-05-08 13:57:21 +02:00
Bart Visscher
175633d380 Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app
Use === and !== in user_ldap app
2013-05-07 12:45:43 -07:00
Arthur Schiwon
498eae49b1 LDAP: prepare settings for internal username attribute and clearing user mappings 2013-05-07 19:31:51 +02:00
icewind1991
5b61c5d478 Merge pull request #3044 from owncloud/backgroundwatcher
Add a background job to watch for external filesystem changes
2013-05-07 10:00:00 -07:00
Arthur Schiwon
68ecee9771 LDAP: Coypright info 2013-05-07 18:23:49 +02:00
Morris Jobke
deb0885e46 Merge pull request #3246 from owncloud/newfile-mimetype
Files: set the proper mimetype when creating a new text file
2013-05-07 01:53:43 -07:00