Thomas Tanghus
|
a0b79f5649
|
Dialogs: Loose up-button.
|
2013-05-17 06:48:24 +02:00 |
|
Thomas Tanghus
|
e60d86bdd1
|
Dialogs: Make slug show last dir emphasized.
|
2013-05-17 06:16:51 +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 |
Florin Peter
|
d7dc710c8b
|
revert changes
|
2013-05-17 01:22:30 +02:00 |
|
Florin Peter
|
a92dead754
|
only connect share hooks if installation OC is installed
|
2013-05-17 01:20:02 +02:00 |
|
Florin Peter
|
469d6028ad
|
revert changes
|
2013-05-17 01:17:55 +02:00 |
|
Florin Peter
|
2b0bf4dc87
|
added tests for recovery
|
2013-05-17 01:07:50 +02:00 |
|
Florin Peter
|
a4c0eb1756
|
improved tests
|
2013-05-17 01:07:26 +02:00 |
|
Florin Peter
|
42b4963dd0
|
moved enable and disable recovery to Helper class for unit tests
|
2013-05-17 00:58:41 +02:00 |
|
Florin Peter
|
3793e4d2d6
|
fix for recover files in subfolder
|
2013-05-16 22:57:55 +02:00 |
|
Florin Peter
|
d40d6aa358
|
fix typo in addRecoveryKeys
|
2013-05-16 22:39:09 +02:00 |
|
Thomas Tanghus
|
4a8db293ec
|
Merge branch 'oc_dialogs_oc_template' of github.com:owncloud/core into oc_dialogs_oc_template
Conflicts:
core/js/oc-dialogs.js
|
2013-05-16 18:21:56 +02:00 |
|
Thomas Tanghus
|
913941d894
|
Line length etc.
|
2013-05-16 18:19:28 +02:00 |
Björn Schießle
|
95297c2469
|
add pre-shared hooks
|
2013-05-16 17:44:28 +02:00 |
|
Björn Schießle
|
f1a5b8b524
|
show nicer warning if the admin recovery password was wrong
|
2013-05-16 16:01:40 +02:00 |
|
Björn Schießle
|
8ae30891b3
|
some error handling in case the recovery password is wrong
|
2013-05-16 15:19:53 +02:00 |
|
Björn Schießle
|
9d1e60325c
|
allow admin to recover users files in case of password lost
|
2013-05-16 14:53:04 +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 |
|
Thomas Tanghus
|
c8bbf90feb
|
Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
|
2013-05-16 13:41:04 +02:00 |
|
Jenkins for ownCloud
|
966c2231e3
|
[tx-robot] updated from transifex
|
2013-05-16 02:01:37 +02:00 |
|
Florin Peter
|
67a80e1870
|
improved tests for touch
|
2013-05-16 00:44:40 +02:00 |
|
Florin Peter
|
0fca2f8f31
|
added tests for put content, get content, touch and fopen
|
2013-05-16 00:36:40 +02:00 |
|
Florin Peter
|
c651950a17
|
fix for re-share and removed check if file exists because we are sometime into a pre_put_contents hook
|
2013-05-16 00:34:45 +02:00 |
|
Florin Peter
|
c0c4fe5fd3
|
fix if file is not yet created
|
2013-05-16 00:31:17 +02:00 |
|
Florin Peter
|
8f963b95e5
|
added test for share with group
|
2013-05-16 00:30:01 +02:00 |
|
Thomas Tanghus
|
f355d797ff
|
Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
|
2013-05-16 00:23:05 +02:00 |
|
Thomas Müller
|
0b2bfe6186
|
Merge pull request #3371 from owncloud/fix-3353
Fix finding mount in background watcher, fixes #3353
|
2013-05-15 15:02:01 -07:00 |
|
Thomas Mueller
|
3c779b0632
|
Merge branch 'master' into hooks
|
2013-05-15 23:49:41 +02:00 |
|
Thomas Mueller
|
5dcec346e5
|
Merge branch 'master' into fix-3353
|
2013-05-15 23:43:46 +02:00 |
|
Thomas Müller
|
dfddaf8fbf
|
Merge pull request #3374 from owncloud/vobject_compound_property
Add Compound property to avoid double escaping values.
|
2013-05-15 14:34:16 -07:00 |
|
Thomas Mueller
|
990980392c
|
No unit test coverage reports for pgsql - this causes issues on Jenkins.
|
2013-05-15 22:44:15 +02:00 |
|
Florin Peter
|
b75a0abb6b
|
added test for rename folder
|
2013-05-15 22:42:22 +02:00 |
|
Thomas Müller
|
4b3c58c2ca
|
Merge pull request #3376 from owncloud/fix_for_disappearing_root_mount_point
fix for disappearing root mount point on lib/files/filesystem.php
|
2013-05-15 12:34:32 -07:00 |
|
Florin Peter
|
ec2e193a44
|
removed unused code
|
2013-05-15 21:01:03 +02:00 |
|
Florin Peter
|
5fcb5f3aba
|
added test for password change
|
2013-05-15 21:00:35 +02:00 |
|
Florin Peter
|
c50bf3e3c5
|
fix for losing mount point "/"
|
2013-05-15 20:09:02 +02:00 |
|
Florin Peter
|
68059b1ec3
|
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
|
2013-05-15 19:49:40 +02:00 |
|
Thomas Tanghus
|
cb41a30b00
|
Add Compound property to avoid double escaping values.
|
2013-05-15 18:56:54 +02:00 |
|
Björn Schießle
|
12ebc5a1b3
|
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
|
2013-05-15 17:57:18 +02:00 |
|
Björn Schießle
|
57c0a7ed69
|
add recovery key to all files if the user enabled the feature and removes them again on disable
|
2013-05-15 17:56:45 +02:00 |
|
Florin Peter
|
0916769f67
|
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
|
2013-05-15 17:00:01 +02:00 |
|
Björn Schießle
|
1a31dc036a
|
added missing file to enable the admin to change the recovery key password
|
2013-05-15 16:14:54 +02:00 |
|
Björn Schießle
|
1f5ed65b12
|
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
|
2013-05-15 16:13:29 +02:00 |
|
Björn Schießle
|
64d94c540a
|
enable admin to change the recovery password
|
2013-05-15 16:12:20 +02:00 |
Michael Gapczynski
|
d91161186b
|
Fix finding mount in background watcher, fixes #3353
|
2013-05-15 09:33:38 -04:00 |
|
Michael Gapczynski
|
de2ccf4723
|
Merge pull request #3366 from owncloud/contributing_add_contacts
Add Contacts repo to CONTRIBUTING.md
|
2013-05-15 06:24:21 -07:00 |
|
Florin Peter
|
63a790b415
|
fix for broken tests
|
2013-05-15 14:33:08 +02:00 |
|
Florin Peter
|
1fbdc3ce8f
|
fix for previous workaround
|
2013-05-15 14:32:50 +02:00 |
|
Björn Schießle
|
5b160edebb
|
check if the user knows the correct recovery password before changing the recovery key settings
|
2013-05-15 14:02:13 +02:00 |