Jörn Friedrich Dreyer
263c3f3a42
attach on to filelist instead of individual td elements for file link behaviour
2013-01-30 17:10:40 +01:00
Jörn Friedrich Dreyer
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
Björn Schießle
9ca0a93847
make spinner title translatable
2013-01-30 16:20:13 +01:00
Björn Schießle
c62a38fcb1
add spinner for undelete operation for visualisation
2013-01-30 15:35:24 +01:00
Björn Schießle
1592764a60
show a spinner instead of the delete button while moving files to the trash bin
2013-01-30 14:32:20 +01:00
Jan-Christoph Borchardt
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
Arthur Schiwon
8f388d9df4
LDAP: update link to online documentation
2013-01-30 13:48:59 +01:00
Jörn Friedrich Dreyer
81a398c22c
use $.trim() for IE8
2013-01-30 13:29:24 +01:00
Björn Schießle
e6f1544f51
fix OC_Log::ERROR call
2013-01-30 13:04:32 +01:00
Björn Schießle
a6e5f4b85c
some minor improvements
2013-01-30 13:01:53 +01:00
Jörn Friedrich Dreyer
99dfaee1f6
reset checkbox after getting selected files instead of ofter dragging, speed up revert
2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer
1d0ee61f3a
use post instead of get
2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer
0089b17749
add multselect dnd
2013-01-30 12:59:34 +01:00
Thomas Müller
5761bd771f
Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10
...
hide upload progress bar and cancel action in IE < 10
2013-01-30 02:48:12 -08:00
Björn Schießle
d6adab6734
improved message if trash bin is empty
2013-01-30 10:07:29 +01:00
Arthur Schiwon
8fd263ef63
LDAP: update quota on every uncached userExists, i.e. also on every isLoggedIn, fixes #1278
2013-01-30 03:57:46 +01:00
Arthur Schiwon
e8db1e884e
LDAP: some inline documentation
2013-01-30 03:44:11 +01:00
Arthur Schiwon
14bc6f8c6c
LDAP: working visual feedback on save. Save button will be highlighted green or red.
2013-01-30 03:34:51 +01:00
Arthur Schiwon
19867b1d08
LDAP: make sure app meta data is not deleted from database when deleting configuration with empty prefix
2013-01-30 02:39:44 +01:00
Arthur Schiwon
a557522037
LDAP: send back error message properly
2013-01-30 02:39:11 +01:00
Arthur Schiwon
9f7d780276
LDAP: use consolidated method for determining config prefix
2013-01-30 02:31:14 +01:00
Arthur Schiwon
a8ac4bdf79
LDAP: Always preset configuration prefix when no configuratin is stored or all remaining ones are deleted
2013-01-30 02:30:24 +01:00
Jenkins for ownCloud
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
Lukas Reschke
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
Sam Tuke
c1f20fe37a
Made encyrption keyfiles be deleted when their parents are
...
Made encryption keyfiles be renamed when their parents are
Fixed bugs with encryptAll() execution on login
2013-01-29 19:54:40 +00:00
Arthur Schiwon
f33b72677b
LDAP: implement support for ownCloud Display Names
2013-01-29 20:41:48 +01:00
Björn Schießle
0c8bcacdc8
added some additional error handling
2013-01-29 13:36:33 +01:00
Björn Schießle
eafd34684c
seperate css no longer needed, use files app css instead
2013-01-29 10:08:41 +01:00
Björn Schießle
d10e137939
icons added; empty trash bin message added
2013-01-29 10:03:04 +01:00
Michael Gapczynski
5143660cd3
Merge pull request #1324 from owncloud/permanent-share-icons
...
Permanently display shared status icons
2013-01-28 20:17:40 -08:00
Jenkins for ownCloud
8c4931a645
[tx-robot] updated from transifex
2013-01-29 00:06:20 +01:00
Robin Appelman
a67f11c8af
Sharing: partailly fix searchByMime
2013-01-28 21:25:19 +01:00
Robin Appelman
86e5a9cd73
Files: fix sharing newly uploaded files
2013-01-28 21:09:18 +01:00
Robin Appelman
929b8c3e69
fix files_version hooks
2013-01-28 20:04:10 +01:00
Robin Appelman
7207211f3a
change required ownCloud version to 4.91
2013-01-28 19:58:24 +01:00
Jan-Christoph Borchardt
01b3c088a9
fix color change on click
2013-01-28 19:47:51 +01:00
Robin Appelman
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
Jan-Christoph Borchardt
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
Robin Appelman
c9c919da57
Move streamwrappers to seperate files and put them in a namespace
2013-01-28 15:34:15 +01:00
Björn Schießle
320233ec3d
merge conflict fixed
2013-01-28 15:10:00 +01:00
Björn Schießle
f28857377d
use hidden input field to disable sharing
2013-01-28 11:28:16 +01:00
Björn Schießle
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +01:00
Jan-Christoph Borchardt
329d965441
merge changes in navigation
2013-01-28 10:52:15 +01:00
Thomas Mueller
11e88f4939
call ajax scan only if a user is logged in - otherwise we'll get a 500
2013-01-28 09:48:03 +01:00
Thomas Mueller
47ce3c2160
include keyboardshortcuts.js
2013-01-28 09:47:21 +01:00
Thomas Mueller
03a1a20316
fixing href for folders
2013-01-28 09:46:52 +01:00
Thomas Müller
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Michael Gapczynski
10c428830e
Add create permission, fixes #780
2013-01-27 23:31:31 -05:00
Robin Appelman
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
Jenkins for ownCloud
b655444709
[tx-robot] updated from transifex
2013-01-28 00:05:43 +01:00
Jenkins for ownCloud
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
Robin Appelman
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
Lukas Reschke
2e42c6f54f
Use HTML5 data attribute + fix undefined variable
2013-01-26 14:07:35 +01:00
Lukas Reschke
6c882d9806
Remove outdated comments
2013-01-26 14:03:17 +01:00
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
Jenkins for ownCloud
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
raghunayyar
a86da16a10
More Style Fixes
...
Remove Repeating Background behind folder names in files app
part.breadcrumb.php
2013-01-25 20:50:55 +05:30
Lukas Reschke
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
Björn Schießle
839f4bd949
show display name instead of uid in the public shared files view
2013-01-25 13:01:53 +01:00
Jenkins for ownCloud
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
Arthur Schiwon
3e99f12120
LDAP: make settings strings in JS translatable
2013-01-24 22:47:25 +01:00
Arthur Schiwon
2749a14171
LDAP: make it possible to enable/disable server configurations
2013-01-24 22:39:05 +01:00
Sam Tuke
094213e231
Fixed many coding guidelines issues
...
Continued work on upgrade path via login hook listener
New spec file with notes
2013-01-24 18:37:34 +00:00
Thomas Mueller
ef88ceba8c
drop SimpleTest compatibility
2013-01-24 16:47:17 +01:00
Björn Schießle
dbb0d04073
restore file in the root folder if the origin folder is not writable
2013-01-24 15:29:22 +01:00
Arthur Schiwon
6bc7256966
LDAP: forgotten file for deleteConfig feature
2013-01-24 14:12:12 +01:00
Arthur Schiwon
5b9e181198
LDAP: implement deleteConfiguration feature
2013-01-24 14:11:53 +01:00
Arthur Schiwon
3bf38c7a84
LDAP: add missing new LDAP Helper
2013-01-24 13:01:43 +01:00
Arthur Schiwon
fccfdb2a52
LPAP: cleanup settings.php, it's already ajaxified
2013-01-24 13:01:20 +01:00
Arthur Schiwon
b2ea78c00d
LDAP: improve and cleanup settings JS
2013-01-24 13:00:40 +01:00
Arthur Schiwon
b084ed6a42
LDAP: clean up, save configuration is now handled by Ajax
2013-01-24 12:46:10 +01:00
Arthur Schiwon
319dcd45e1
LDAP: Clear cache on saving settings
2013-01-24 12:44:30 +01:00
Arthur Schiwon
96949fc9dd
LDAP: consolidate config prefix determination, autofill combo box in settings
2013-01-24 12:42:28 +01:00
Jenkins for ownCloud
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
Arthur Schiwon
b979bf6f1c
LDAP: fix default
2013-01-23 23:46:55 +01:00
Arthur Schiwon
06c284f6cc
LDAP settings: read configuration when another server config is chosen
2013-01-23 23:41:35 +01:00
Arthur Schiwon
83d9e1e2f0
make sure that Configuration is read when getConfiguration is called. And give back the appropriate result.
2013-01-23 23:40:21 +01:00
Sam Tuke
59ca312263
Work on util: findFiles() and encryptAll(); both close to working
...
Ecnryption unit tests are failing, recursion in filecache{}
2013-01-23 19:24:26 +00:00
Sam Tuke
cd832935e8
Merge branch 'files_encryption'
2013-01-23 12:54:09 +00:00
Björn Schießle
6ab95e8e33
code clean-up
2013-01-23 11:30:42 +01:00
Lukas Reschke
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
Thomas Mueller
5fadd53088
missing renames of publicListView to disableSharing
2013-01-23 09:18:26 +01:00
Jenkins for ownCloud
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
Robin Appelman
f858381775
merge master into filesystem
2013-01-22 23:27:04 +01:00
Björn Schießle
367aadb3b7
rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view
2013-01-22 18:34:59 +01:00
Sam Tuke
aa648fca75
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
Sam Tuke
47592657d7
Added localisation for encryption settings
2013-01-22 17:15:03 +00:00
Björn Schießle
f919230f63
remove inline JavaScript
2013-01-22 17:59:33 +01:00
Sam Tuke
619780a67d
Merge branch 'master' into files_encryption
2013-01-22 16:50:20 +00:00
Björn Schießle
16ae902e31
no undo notification for deleted file, we use the trash bin instead
2013-01-22 17:43:46 +01:00
Björn Schießle
b694f996d9
allow admin to change retention obligation for the trash bin, default value is 180 days
2013-01-22 15:33:54 +01:00
Björn Schießle
16d7716dee
calculate correct relative date for trashbin file list
2013-01-22 15:33:54 +01:00
Björn Schießle
97e69e5374
remove table row in trash bin view after undelete
2013-01-22 15:33:54 +01:00
Björn Schießle
81ab0affef
allow to restore single files/folder from a deleted folder
2013-01-22 15:33:54 +01:00
Björn Schießle
1817c7895b
allow to look into deleted directories
2013-01-22 15:33:54 +01:00
Björn Schießle
1255791ef2
handle group restore
2013-01-22 15:33:54 +01:00
Björn Schießle
655a20f963
expire files in trash bin after 30 days
2013-01-22 15:33:54 +01:00
Björn Schießle
8e57fe1a08
remove unneeded function
2013-01-22 15:33:54 +01:00
Björn Schießle
a3da82261b
remove item in the trash bin view after successful undelete
2013-01-22 15:33:53 +01:00
Björn Schießle
d605228937
first version of the trash bin app
2013-01-22 15:33:53 +01:00
Björn Schießle
8259768732
introduce option to disable download action
2013-01-22 15:33:53 +01:00
Björn Schießle
dfab3d3d7f
call the trash bin view
2013-01-22 15:33:53 +01:00
Björn Schießle
9bacb0e179
rename "publicListView" option to "disableSharing", this is more meaningful also because it is not only useful for the public list view
2013-01-22 15:33:53 +01:00
Björn Schießle
f15deaf556
listen to post delete event to allow the trash bin to create a copy of the version first
2013-01-22 15:32:57 +01:00
Björn Schießle
9d77317de8
add trash button to web interface
2013-01-22 15:32:57 +01:00
Lukas Reschke
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
Michael Gapczynski
e666ce3622
Fix external storage UI for new storage namespaces
2013-01-21 23:57:26 -05:00
Robin Appelman
f2d0eeae83
Merge branch 'master' into filesystem
2013-01-22 00:19:44 +01:00
Lukas Reschke
8223117569
Remove closing tag
2013-01-21 22:29:27 +01:00
Robin Appelman
1762378f67
Files: don't load fileactions.js when upgrading filecache
2013-01-21 22:07:55 +01:00
Lukas Reschke
9bc8df3649
Move publicListView to external JS
2013-01-21 20:36:19 +01:00
Lukas Reschke
0d02caa684
No inline JS in apps
2013-01-21 20:34:28 +01:00
Jenkins for ownCloud
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
Arthur Schiwon
10876aba89
fix more config keys for save settings handling
2013-01-20 18:30:14 +01:00
Arthur Schiwon
0c3466325b
fix continue in switch, add another key to skip
2013-01-20 18:27:39 +01:00
Arthur Schiwon
6d84aa93d3
Ajaxifiy Settings Save
2013-01-20 18:02:44 +01:00
Robin Appelman
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
Jenkins for ownCloud
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
Thomas Mueller
5d6c1d52bd
replace #notification with OC.Notification call
2013-01-19 21:37:05 +01:00
Thomas Mueller
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +01:00
Lukas Reschke
53b95cb8fd
Merge pull request #1230 from owncloud/remove-unused-autocomplete.php
...
Remove uneeded file
2013-01-19 05:56:27 -08:00
Jan-Christoph Borchardt
ae244972cb
Merge pull request #1228 from owncloud/generating_zip_message
...
Make the ZIP download information friendlier
2013-01-19 04:33:39 -08:00
Lukas Reschke
02bd8dd45a
Change the second part of the notification
2013-01-19 13:12:27 +01:00
Michael Gapczynski
8ca30d244c
Implement getETag() in shared storage
2013-01-19 00:02:40 -05:00
Thomas Mueller
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
Thomas Mueller
cdd07b3339
introducing class OCA/files/lib/Helper with new function to build an array with storage stats
...
DRYing the code by using \OCA\files\lib\Helper::buildFileStorageStatistics()
now returning used space percent on each ajax call
2013-01-19 00:31:09 +01:00
Jenkins for ownCloud
a17ca3a69a
[tx-robot] updated from transifex
2013-01-19 00:05:38 +01:00
Thomas Mueller
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Lukas Reschke
f447e6469f
Remove uneeded file
...
I don't saw any usage of this file through the code, I assume it can
safely be removed.
2013-01-18 23:07:11 +01:00
Thomas Müller
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
Lukas Reschke
ad57db3e87
Make the message friendlier
2013-01-18 22:35:26 +01:00
Jörn Friedrich Dreyer
5e16510a53
hide upload progress bar and cancel action in IE < 10
2013-01-18 22:06:42 +01:00
Thomas Mueller
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
Jan-Christoph Borchardt
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
Arthur Schiwon
229a25f41a
fix mixed key and value
2013-01-18 13:53:26 +01:00
Arthur Schiwon
805f900b19
LDAP: pass defaults to settings form, and restore them on creating a new configuration if wanted
2013-01-18 13:45:39 +01:00
Arthur Schiwon
229d484200
LDAP: gather defaults in one place, simplify readConfiguration
2013-01-18 13:35:40 +01:00
Arthur Schiwon
1c19e66712
coding style
2013-01-18 11:42:34 +01:00
Arthur Schiwon
a53addf825
LDAP: first basics for multiserver config ui
2013-01-18 01:23:15 +01:00
Jenkins for ownCloud
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
Thomas Mueller
130c9cad03
relative storage info without decimals
2013-01-17 16:52:57 +01:00
Thomas Mueller
b7d3bf5f81
rename space -> storage
2013-01-17 16:49:10 +01:00
Arthur Schiwon
d8be83029b
make sure port is used as backup port if not specified. documentation. determine connection error earlier.
2013-01-17 13:56:37 +01:00
Arthur Schiwon
59a6068246
fix undeclared variable
2013-01-17 13:46:32 +01:00
Arthur Schiwon
3d56cf3a5b
LDAP: add support for backup/replica servers
2013-01-17 13:31:14 +01:00
Jenkins for ownCloud
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +01:00
Robin Appelman
bb43cf378b
Files: make sure keybinds js is loaded after files js
2013-01-16 21:36:25 +01:00
Robin Appelman
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
Bart Visscher
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
Arthur Schiwon
6063ce9c8d
LDAP: enable support for multiple LDAP/AD servers
2013-01-16 14:59:41 +01:00
Arthur Schiwon
4699f36e44
LDAP: fix read configuration, remove unnecessary debug output
2013-01-16 14:58:49 +01:00
Arthur Schiwon
ad1113c2cb
LDAP: fix parameter passed not as expected
2013-01-16 14:56:57 +01:00
Björn Schießle
2b9c925a2b
Merge pull request #1192 from schiesbn/versioning_history_issue_1189
...
fix for issue #1186 , missing variables added
2013-01-16 01:26:43 -08:00
Björn Schießle
73c4d0faff
initialize $versionCreated
2013-01-16 10:20:09 +01:00
Jenkins for ownCloud
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +01:00
Robin Appelman
7debfac0dc
Cache: more efficient upgrading
2013-01-15 19:11:12 +01:00
Robin Appelman
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
Bart Visscher
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
Robin Appelman
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
Jan-Christoph Borchardt
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
Björn Schießle
60d5d5f636
fix for issue #1186 , missing variables added
2013-01-15 14:34:15 +01:00
blizzz
bb9cc227c2
Merge pull request #1087 from owncloud/ldap_multiple_dns
...
LDAP: ability to configure more than one base DN
2013-01-15 04:01:57 -08:00
Jenkins for ownCloud
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Bart Visscher
7455056d2d
Merge pull request #1169 from owncloud/webdav_L10n
...
user_webdavauth - l10n - Trivial
2013-01-14 12:28:51 -08:00
Lukas Reschke
9eb16e06f7
Merge pull request #1135 from owncloud/allow_default_click_behaviour
...
allow default click behaviour
2013-01-14 11:24:02 -08:00
Sam Tuke
d95fc4e1e3
Adding sharing support: added new method in Keymanager setShareKey()
...
Added notes in proxy{} and stream{} pointing to share support
2013-01-14 19:07:28 +00:00
Sam Tuke
1641ed8ac7
Merge branch 'master' into files_encryption
2013-01-14 16:54:25 +00:00
Sam Tuke
e9f3c5feea
Added creation of dir for shared file env encryption keys
...
Added comment to use multiKeyEncrypt
2013-01-14 15:39:04 +00:00
Thomas Müller
51a4240051
Merge pull request #1170 from owncloud/correctIndention
...
Remove ugly indentation - Trivial
2013-01-14 04:59:53 -08:00
Sam Tuke
3fbf362ba2
Removed debugging comments
2013-01-14 12:36:46 +00:00
Björn Schießle
cd802ed45b
Merge branch 'master' of github.com:owncloud/core
2013-01-14 10:33:17 +01:00
Björn Schießle
e0173303e6
merge conflict fixed, settings-personal.php is no longer needed
...
Conflicts:
apps/files_versions/templates/settings-personal.php
2013-01-14 10:24:40 +01:00
Jenkins for ownCloud
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
Lukas Reschke
2a7e5faa37
Remove ugly indentation
2013-01-13 01:02:11 +01:00
Lukas Reschke
9cfc195b7c
The => This
...
Sounds better for me.
2013-01-13 00:45:45 +01:00
Lukas Reschke
90d0d08826
Improved the help text
2013-01-13 00:37:58 +01:00
Lukas Reschke
fb7f9e25c3
legend - l10n
2013-01-13 00:32:44 +01:00
Jenkins for ownCloud
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
Björn Schießle
d276d21c76
- code clean-up
...
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
2013-01-11 19:33:54 +01:00
Arthur Schiwon
09c54722a8
add LDAP User and Group proxies to suppoer multiple servers
2013-01-11 18:13:22 +01:00
Thomas Mueller
e560cba76b
adding a ajax call to get the current file storage stats like free space
...
logic to call it every 5 minutes
make use of visibility API/jquery-visibility to perform the ajax call only if the browser is visible/in use
2013-01-11 16:47:28 +01:00
Thomas Mueller
938254a1c0
load jquery-visibility
2013-01-11 16:45:32 +01:00
Thomas Mueller
362860c5b5
adding jquery-visibility
...
https://github.com/mathiasbynens/jquery-visibility
MIT and GPL licensed
2013-01-11 16:44:25 +01:00
Thomas Mueller
3d33e8f845
fixing indent - sorryy wrong setting on the IDE :-(
...
replace missing calls to OC.Notification.show
2013-01-11 15:02:34 +01:00
Thomas Mueller
9afdc14d40
adding accidentally removed line - THX @bartv2
2013-01-11 14:55:49 +01:00
Björn Schießle
99a0ea44ee
function description fixed
2013-01-11 14:24:00 +01:00
Björn Schießle
67d00bc6bb
some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed
2013-01-11 14:23:28 +01:00
Thomas Mueller
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
Björn Schießle
6be9c0a974
some code clean-up
2013-01-11 11:12:32 +01:00
Thomas Mueller
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Thomas Mueller
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
Michael Gapczynski
36cac7f924
Return NOT_FOUND in shared cache
2013-01-10 22:29:47 -05:00
Thomas Müller
60489764f3
Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
...
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
Jenkins for ownCloud
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
Arthur Schiwon
fab5817f67
documentation for the Connection constructor
2013-01-10 23:34:24 +01:00
Arthur Schiwon
0784bcb8d7
introduce configPrefix to allow settings for multiple LDAP servers
2013-01-10 23:30:26 +01:00
Sam Tuke
fed74eda1c
Removed old and unnecessary comments
2013-01-10 18:48:40 +00:00