Michael Gapczynski
664f33a29c
Update mtimes of all parent folders after change inside
2013-01-19 21:04:25 -05:00
Michael Gapczynski
8ca30d244c
Implement getETag() in shared storage
2013-01-19 00:02:40 -05:00
Michael Gapczynski
cd8d8360b0
Disable fancy folder sharing for now
2013-01-18 23:57:13 -05:00
Michael Gapczynski
5df6f9d14d
Fix merge
2013-01-18 23:56:47 -05:00
Robin Appelman
6871a150bd
Cache: use a database transition for scanning each folder
...
gives a massive speed improvement while scanning files
2013-01-16 21:58:17 +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
f9c42a196f
Cache: no longer using this file
2013-01-16 21:36:04 +01:00
Robin Appelman
29ec007979
Cache: dont migrate permissions, cache them on demain instead
2013-01-16 19:11:33 +01:00
Robin Appelman
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
Bart Visscher
1d57a2e2a9
Merge pull request #1180 from owncloud/whitespace-cleanup
...
Whitespace cleanup
2013-01-16 09:25:57 -08: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
Jan-Christoph Borchardt
cb0fd30458
Merge pull request #1185 from owncloud/fixing-1162-master
...
handling proper display of files/folders with negative size
2013-01-16 05:18:53 -08: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
5935f6adff
Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into versioning_history_issue_1189
2013-01-16 10:25:48 +01:00
Björn Schießle
73c4d0faff
initialize $versionCreated
2013-01-16 10:20:09 +01:00
Björn Schießle
f71a5dec99
initialize
2013-01-16 10:18:40 +01:00
Thomas Müller
1f7bf57ece
Merge pull request #1195 from owncloud/cache_prepared
...
Cache prepared statements in OC_DB
2013-01-15 22:23:34 -08:00
Robin Appelman
f18fc1c510
Clear cached prepared statements when switching between mdb2 and pdo
2013-01-16 01:12:13 +01:00
Jenkins for ownCloud
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +01:00
Thomas Müller
4668f8c86e
Merge pull request #1178 from owncloud/return_true_because_of_ponies
...
Remove uneeded return
2013-01-15 14:01:48 -08:00
Daniel Molkentin
65ef780ed6
Fix regression caused by 31b1a73e1f
2013-01-15 22:44:40 +01:00
Robin Appelman
a08490364d
Cache prepared statements in OC_DB
2013-01-15 20:21:06 +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
Björn Schießle
b2a3a8d73b
Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into versioning_history_issue_1189
2013-01-15 14:35:48 +01:00
Björn Schießle
60d5d5f636
fix for issue #1186 , missing variables added
2013-01-15 14:34:15 +01:00
Björn Schießle
ef4e6f3d6c
fix for issue #1189 , missing variables added
2013-01-15 13:29:59 +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
42678096bb
remove php closing tag
2013-01-14 23:51:58 +01:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Thomas Mueller
44e5c052b3
handling proper display of files/folders with negative size
...
refs #1162
2013-01-14 23:39:31 +01:00
Lukas Reschke
71ae41716a
Merge pull request #1182 from owncloud/sanitizeHTML-Clean
...
Expanded one line if statement - Trivial
2013-01-14 14:37:23 -08:00
Lukas Reschke
ab287d2ba4
Move { to same line
2013-01-14 22:04:31 +01:00
Lukas Reschke
c845e75693
Expand if to multiple lines
...
Oneliners are ugly.
2013-01-14 22:01:52 +01:00
Bart Visscher
53ca0db434
Merge pull request #1177 from owncloud/OC_User--isAdminUser()
...
Check if user is admin - bool
2013-01-14 12:53:18 -08:00
Lukas Reschke
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
Bart Visscher
8b2307ce4b
Merge pull request #1172 from owncloud/isSubDirectory
...
Simplify the isSubDirectory() function
2013-01-14 12:36:38 -08: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
Lukas Reschke
cc00c54f6a
Remove uneeded returns
2013-01-14 20:18:08 +01:00
Lukas Reschke
0810d80f8a
Add a closing )
...
Thanks Jenkins!
2013-01-14 20:10:10 +01:00
Lukas Reschke
e8b45caa51
Remove uneeded return
...
Thx @Raydiation
2013-01-14 19:57:28 +01:00
Lukas Reschke
fef73d96d1
CP fail
2013-01-14 19:51:16 +01:00
Lukas Reschke
31b1a73e1f
Check if user is admin - bool
...
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)
Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
Lukas Reschke
99adfbdb86
Check for string position instead of string existence
...
otherwise /foo/bar would be detected as a subfolder of /bar
THX @icewind1991
2013-01-14 16:51:35 +01:00
Bart Visscher
fa78fbe0c3
Merge pull request #1112 from Raydiation/master
...
This fixes a problem that prevented app routes from being loaded after ocs_api merge
2013-01-14 07:35:14 -08:00
