1306 Commits

Author SHA1 Message Date
Thomas Müller
ac693c2974 Merge pull request #423 from owncloud/fix-phpunit
define PHPUNIT constant only if not already set
2015-01-09 10:22:52 +01:00
Jenkins for ownCloud
ec4b211af1 [tx-robot] updated from transifex 2015-01-06 00:43:18 -05:00
Jenkins for ownCloud
df3d8a67f1 [tx-robot] updated from transifex 2015-01-05 00:43:17 -05:00
Jenkins for ownCloud
5281468ecf [tx-robot] updated from transifex 2015-01-04 00:43:17 -05:00
Jenkins for ownCloud
c829621fbc [tx-robot] updated from transifex 2015-01-03 00:43:18 -05:00
Jan-Christoph Borchardt
e443a11d3e Merge pull request #420 from owncloud/better-close
better style for close button
2015-01-02 09:59:46 +01:00
Morris Jobke
22dcb6e2e4 define PHPUNIT constant only if not already set 2015-01-02 09:46:13 +01:00
Jenkins for ownCloud
e851f57e2a [tx-robot] updated from transifex 2014-12-31 00:43:17 -05:00
VicDeo
5ceee86910 Merge pull request #422 from owncloud/fix-421
Update hardcoded link
2014-12-24 20:26:47 +03:00
Jenkins for ownCloud
a9d87a60bb [tx-robot] updated from transifex 2014-12-24 00:43:17 -05:00
Victor Dubiniuk
667609be6e Update hardcoded link 2014-12-23 18:37:04 +03:00
Jan-Christoph Borchardt
82122ecb2b better style for close button 2014-12-23 15:16:14 +01:00
Jenkins for ownCloud
c3f61539b3 [tx-robot] updated from transifex 2014-12-23 00:43:18 -05:00
Jenkins for ownCloud
6060e1c623 [tx-robot] updated from transifex 2014-12-20 00:43:17 -05:00
Thomas Müller
a4e14b9bd7 Merge pull request #418 from owncloud/fix-travis-master
Remove php 5.3 and build.xml
2014-12-19 11:46:03 +01:00
VicDeo
8b8c4704c1 Merge pull request #415 from owncloud/new-header
New header bar
2014-12-19 12:32:15 +03:00
Victor Dubiniuk
fbaae4b215 Patch for Tollbar 2014-12-19 12:05:33 +03:00
Thomas Müller
e347236853 Remove php 5.3 and build.xml 2014-12-18 23:35:15 +01:00
Victor Dubiniuk
755fa560a7 Place OC controls inside own toolbar as dijit widgets 2014-12-19 00:02:40 +03:00
Thomas Müller
58b14218b6 Merge pull request #379 from owncloud/remove-minified
Use not minified webodf source. Let Assetic do its job
2014-12-18 15:25:44 +01:00
Jenkins for ownCloud
d4efd4ab22 [tx-robot] updated from transifex 2014-12-18 00:43:17 -05:00
Jenkins for ownCloud
215a12b1f8 [tx-robot] updated from transifex 2014-12-17 00:43:18 -05:00
Jenkins for ownCloud
48ee5408d6 [tx-robot] updated from transifex 2014-12-04 00:43:18 -05:00
VicDeo
78da836eb3 Merge pull request #403 from owncloud/remove-phpass
Remove phpass
2014-11-25 21:30:58 +03:00
Jenkins for ownCloud
58801889e2 [tx-robot] updated from transifex 2014-11-22 00:43:28 -05:00
Volkan Gezer
1079947ef3 Merge pull request #409 from owncloud/rmobslang
remove obsolete langs. #11274
2014-11-21 21:03:38 +01:00
VicDeo
4b391af043 Merge pull request #408 from owncloud/encode-amp
encodeURIComponent on dirname
2014-11-20 18:33:11 +03:00
Volkan Gezer
b7dd71753d remove obsolete langs. #11274 2014-11-20 15:01:51 +01:00
Victor Dubiniuk
39e72cbbcf encodeURIComponent on dirname 2014-11-19 23:40:19 +03:00
VicDeo
4f61ee2a5e Merge pull request #405 from owncloud/group-users
Group members by userId. Ref #125
2014-11-19 21:44:16 +03:00
Victor Dubiniuk
5ab8dc512d Combine MemberListViev patches 2014-11-19 20:45:25 +03:00
Victor Dubiniuk
5cef103648 Group members by userId. Ref #125 2014-11-19 19:56:27 +03:00
VicDeo
3cac42ce87 Merge pull request #404 from owncloud/fix-disconnect
Fix member disconnection routes
2014-11-19 03:34:35 +03:00
Victor Dubiniuk
3e5b13f752 Fix member disconnection routes 2014-11-19 01:15:15 +03:00
Lukas Reschke
9304bf1539 Remove phpass
See https://github.com/owncloud/core/pull/12226
2014-11-17 14:12:35 +01:00
Jenkins for ownCloud
46f141ab68 [tx-robot] updated from transifex 2014-11-17 00:43:19 -05:00
Jenkins for ownCloud
016e1363ac [tx-robot] updated from transifex 2014-11-15 00:43:18 -05:00
Jenkins for ownCloud
16d64a37a1 [tx-robot] updated from transifex 2014-11-14 00:43:19 -05:00
VicDeo
da3705e8b7 Merge pull request #402 from owncloud/optype-as-a-separate-field
Use a separate field for optype.
2014-11-13 22:04:09 +03:00
Victor Dubiniuk
0f19d74f69 Improve filtering for member/cursor operations 2014-11-13 20:29:48 +03:00
Jenkins for ownCloud
28a5038fbd [tx-robot] updated from transifex 2014-11-13 00:43:19 -05:00
Victor Dubiniuk
59a095e98d updateMember is not used currently 2014-11-13 01:34:44 +03:00
Victor Dubiniuk
65de023e94 Use a separate field for optype. No more LIKE in queries 2014-11-13 01:20:54 +03:00
Jenkins for ownCloud
0affaa432b [tx-robot] updated from transifex 2014-11-12 00:43:25 -05:00
VicDeo
5bcdb206ea Merge pull request #400 from owncloud/simplify-polling
Move ops sync to a separate method
2014-11-12 01:27:28 +03:00
Victor Dubiniuk
8f9b3fb867 Move ops sync to a separate method 2014-11-12 00:15:20 +03:00
VicDeo
a1e84804cf Merge pull request #399 from owncloud/remove-extra-arg
Insert doesn't require an argument
2014-11-11 21:42:19 +03:00
Victor Dubiniuk
aa7efd6835 Insert has no arguments 2014-11-11 21:00:33 +03:00
VicDeo
b2bd038152 Merge pull request #398 from owncloud/further-file-simplify
Sharing info is needed for public links only.
2014-11-11 20:38:03 +03:00
Victor Dubiniuk
932684b782 Remove View model. Get permissions from FileInfo 2014-11-11 03:42:49 +03:00